review-retrovert 0.3.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e40dda814381806e0927906afc41f12020c6208c5dae0dcddd8ac764bd641fd0
-  data.tar.gz: 43a77d50400f9241a8a3186bd1f243a9efc3a564151d2ed14779d80a30cc052a
+  metadata.gz: d88019dcbdef1f19522028bd668913c7f2100d2774796ca208a7e72df829b3ef
+  data.tar.gz: 4b3605223424275e592269e6fbfd1124275087c322522b0d5cb309434ee202ac
 SHA512:
-  metadata.gz: 94d70f7740602edc84f8e87fa0d9317481e61f179fa054a55267b8635f5b89f9fa2d506e6b99ed453c3babed9e1c1a20001cb6998fdb88c0eb749035520a03df
-  data.tar.gz: 6afa54492f1a57f1b5cf5d9066e173cd7113ce5e5d7a3544656c7464cf8393b8709468ebe50e558d488b18da198c71e924384b9cbd752631f174d4f1d5c28885
+  metadata.gz: 519813a8c9690db53484fb206084a97c36c8bfe1c230fe09bb623c7d93ce178a81b1bb91eed87a9edfb1c753b345e0d12ca36f50bf8789ea0a6906126b62e771
+  data.tar.gz: '02823e04d7787079bcf94273ab43af37d903c8d8de357fde7c8394094ff88a5e2275e173284496eccf328f74da11c11b8b3d2233814529cb00b4021ff014b19d'

data/.github/workflows/retrovert.yml

@@ -0,0 +1,61 @@
+on: 
+  pull_request:
+  push:
+    branches:
+      - master
+
+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: |
+          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
+      # convert
+      - name: convert
+        run: bundle exec review-retrovert convert testdata/mybook/config.yml tmp -f
+      # build
+      # - 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:
+          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

data/.gitignore

@@ -5,11 +5,11 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+tmp/
 
 # rspec failure tracking
 .rspec_status
 .rakeTasks
 .idea
 
-*.gem
+*.gem

data/.ruby-version

@@ -0,0 +1 @@
+2.5.5

data/Dockerfile

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

data/Gemfile

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

data/Gemfile.lock

@@ -1,41 +1,106 @@
 PATH
   remote: .
   specs:
-    review-retrovert (0.3.2)
-      review (>= 3.2.0, < 4.0)
+    review-retrovert (0.9.4)
+      review (>= 3.0.0)
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    image_size (2.0.2)
+    activesupport (6.1.1)
+      concurrent-ruby (~> 1.0, >= 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, < 6.0)
+      rspec-expectations (~> 3.4)
+      thor (~> 1.0)
+    builder (3.2.4)
+    childprocess (4.0.0)
+    concurrent-ruby (1.1.7)
+    contracts (0.16.0)
+    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.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 (2.0.4)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      sys-uname (~> 1.2, >= 1.2.1)
+    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 (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.1.0)
+    middleware (0.1.0)
+    minitest (5.14.3)
+    multi_test (0.1.2)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
     rake (12.3.3)
-    review (3.2.0)
+    review (5.0.0)
       image_size
       rouge
       rubyzip
-    rouge (3.20.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.2)
+      ffi (~> 1.1)
     thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  aruba (~> 1.0.2)
   rake (~> 12.0)
   review-retrovert!
   rspec (~> 3.0)

data/README.md

@@ -4,6 +4,8 @@
 
 # ReVIEW::Retrovert
 
+[Re:VIEW Starter](https://kauplan.org/reviewstarter/) Project convert to [Re:VIEW](https://reviewml.org/ja/) 3.X/4.X/5.X
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -20,9 +22,68 @@ Or install it yourself as:
 
     $ gem install review-retrovert
 
-## Usage
+## 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
+Usage:
+  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: 　
+
+convert Re:VIEW Starter project to Re:VIEW project
+```
+
+#### retrovert config
 
-TODO: Write usage instructions here
+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
 
@@ -34,10 +95,9 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/srz-zumix/review-retrovert.
 
-
 ## Develop
 
-docker run -it --rm -v $(pwd)/../:/github 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,6 +7,10 @@ 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 "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: '　'
       def convert(review_starter_configfile, outdir)
         Converter.execute(review_starter_configfile, outdir, options)
       end

data/lib/review/retrovert/converter.rb

@@ -13,6 +13,8 @@ module ReVIEW
         @outimagedir = nil
         @logger = ReVIEW.logger
         @configs = YamlConfig.new
+        @embeded_contents = []
+        @catalog_contents = []
       end
 
       def error(msg)
@@ -67,10 +69,45 @@ module ReVIEW
         @configs.rewrite_yml('contentdir', '.')
         @configs.rewrite_yml('hook_beforetexcompile', 'null')
         @configs.rewrite_yml('texstyle', '["reviewmacro"]')
+        # @configs.rewrite_yml('chapterlink', 'null')
+        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
+        }
+      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>//}")
+        end
+      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?
+        content.gsub!(/^\/\/#{command}(?<option>(\[[^\r\n]*?\]){0,#{option_count}})(\[[^\r\n]*\])*{(?<inner>.*?)\/\/}/m, "//#{new_command}\\k<option>#{add_options}{\n#{new_body}//}\\k<inner>")
       end
 
-      def replace_inline_command(content, command, sub)
+      def replace_block_command_outline(content, command, new_command, use_option)
+        if use_option
+          content.gsub!(/^\/\/#{command}(?<option>\[[^\r\n]*\])*{(?<inner>.*?)\/\/}/m, "//#{new_command}\\k<option>{\\k<inner>//}")
+        else
+          content.gsub!(/^\/\/#{command}(?<option>\[[^\r\n]*?\])*{(?<inner>.*?)\/\/}/m, "//#{new_command}{\\k<inner>//}")
+        end
+      end
 
+      def delete_block_command_outer(content, command)
+        content.gsub!(/^\/\/#{command}(\[[^\r\n]*?\])*{(?<inner>.*?)\/\/}\R/m, '\k<inner>')
+      end
+
+      def delete_block_command(content, command)
+        content.gsub!(/^\/\/#{command}(\[[^\r\n]*?\])*{.*?\/\/}\R/m, '')
+        content.gsub!(/^\/\/#{command}(\[.*?\])*\s*\R/, '')
       end
 
       def delete_inline_command(content, command)
@@ -78,6 +115,185 @@ module ReVIEW
         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+)((\[.*?\])*)([$|{])/)
+          unless im.nil?
+            inner_cmd = im[1]
+            inner_open = im[4]
+            inner_opts = im[2]
+            first_opt_m = inner_opts.match(/^\[(.*?)\]/)
+            first_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}\\]"
+                end
+              end
+            end
+            cmd_begin = m[0..4].join
+            cmd_end = m[6..-1].join
+            # check other fence inner block (block command has fence??)
+            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}")
+              else
+                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}")
+              end
+            else
+              close = inner_open == '{' ? '}' : 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}")
+              else
+                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}")
+              end
+            end
+            found = true
+          end
+        }
+        if found
+          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)
+        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|
+          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_sampleoutput(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
+          sampleoutputend = m[4]
+          option = m[1]
+          inner = m[3]
+          # inner.gsub!(/^\/\//, '//@<nop>{}')
+          content.gsub!(/#{Regexp.escape(matched)}/m, "#{option}\n#@##{sampleoutputbegin}#{inner}#@##{sampleoutputend}")
+        }
+      end
+
+      def replace_auto_ids(content, command, require_option_count)
+        index = -1
+        content.gsub!(/^\/\/#{command}\[(|\?)\]/) { |s| index += 1; "//#{command}[starter_auto_id_#{command}_#{index}]" }
+        if require_option_count > 0
+          while !content.gsub!(/(^\/\/#{command}(\[[^\[\]]*?\]){0,#{require_option_count-1}})($|{)/, '\1[]\3').nil?
+          end
+        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|
+          matched = m[0..-1].join
+          ref = m[4]
+          n = content.match(/^\/\/note\[#{ref}\](\[.*?\])/)
+          unless n.nil?
+            content.gsub!(/#{Regexp.escape(matched)}/, n[1])
+            content.gsub!(/^\/\/note\[#{ref}\](\[.*?\])/, '//note\1')
+          else
+            # content.gsub!(/#{Regexp.escape(matched)}/, "noteref<#{ref}>")
+          end
+        }
+      end
+
+      def remove_starter_options(content)
+        # image border
+        content.gsub!(/(^\/\/image\[.*?\]\[.*?\]\[.*?)((,|)border=[^,\]]*)(.*?\])/, '\1\4')
+        # 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
+            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
+          end
+        }
+        if found
+          expand_nested_inline_command(content)
+        end
+      end
+
       def copy_embedded_contents(outdir, content)
         content.scan(/\#@mapfile\((.*?)\)/).each do |filepath|
           srcpath = File.join(@basedir, filepath)
@@ -85,21 +301,125 @@ 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 add_linkurl_footnote(content)
+        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 = "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
         content = File.read(contentfile)
-        content.gsub!(/(\/\/sideimage\[.*?\]\[.*?\])\[.*?\]/, '\1')
-        content.gsub!(/\/\/sideimage/, '//image')
+        content.gsub!(/@<href>{(.*?)#.*?,(.*?)}/, '@<href>{\1,\2}')
         content.gsub!(/@<href>{(.*?)#.*?}/, '@<href>{\1}')
-        while !content.gsub!(/(\/\/table.*)@<br>(.*?\/\/})/m, '\1\2').nil? do
+        linkurl_footnote = @config['starter']['linkurl_footnote']
+        # table 内の @ コマンドは不安定らしい
+        while !content.gsub!(/(\/\/table.*)@<br>{}(.*?\/\/})/m, "\\1#{@table_br_replace}\\2").nil? do
         end
-        delete_inline_command(content , 'xsmall')
-        delete_inline_command(content , 'weak')
+        # 空セルが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)
+        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')
+
+        replace_inline_command(content, 'secref', 'hd')
+        replace_inline_command(content, 'file', 'kw')
+        replace_inline_command(content, 'hlink', 'href')
+        replace_inline_command(content, 'B', 'strong')
+        delete_inline_command(content, 'userinput')
+        delete_inline_command(content, 'weak')
+        delete_inline_command(content, 'cursor')
+        # font size
+        delete_inline_command(content, 'small')
+        delete_inline_command(content, 'xsmall')
+        delete_inline_command(content, 'xxsmall')
+        delete_inline_command(content, 'large')
+        delete_inline_command(content, 'xlarge')
+        delete_inline_command(content, 'xxlarge')
+
+        # fixed lack of options
+        content.gsub!(/^\/\/list{/, '//list[][]{')
+
+        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)
+        end
+
+        # # br to blankline
+        # content.gsub!(/(.*)@<br>{}(.*)/, '\1\n//blankline\n\2')
+
+        # nested command
+        replace_block_command_nested_boxed_articles(content)
+
+        # empty ids
+        replace_auto_ids(content, 'list', 2)
+        replace_auto_ids(content, 'listnum', 2)
+
+        # remove starter extension
+        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')
+        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)
+
+        # fix deprecated
+        fix_deprecated_list(content)
+
         File.write(contentfile, content)
         copy_embedded_contents(outdir, content)
       end
@@ -108,8 +428,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)
@@ -123,18 +448,50 @@ module ReVIEW
         yamlfile = @config['catalogfile']
         abspath = File.absolute_path(outdir)
         contentdir = abspath
-        info 'replace //sideimage to //image'
+        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
 
@@ -145,11 +502,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)
@@ -159,6 +527,8 @@ module ReVIEW
       end
 
       def execute(yamlfile, outdir, options)
+        @table_br_replace = options['table-br-replace']
+        @table_empty_replace = options['table-empty-replace']
         load_config(yamlfile)
         create_initial_project(outdir, options)
 
@@ -173,8 +543,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)