review-retrovert 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9311aa0fa85bd42652cbbe163b02383bb3e3ce8b82d5c10f1d85af48ecda098
-  data.tar.gz: cac37e6eae36803b96a0f009695ffe480a7fafe4642a1bb45a44a4bcc1eb948b
+  metadata.gz: fdd00a05ee2fe184542575f75ff8b5f7541ea11ead119c28b1b00e00d38aeab8
+  data.tar.gz: 6a1dcf4eedabf43d6be0b8bf7814dc11d30d8798730a95e33ed6a95cda59173d
 SHA512:
-  metadata.gz: 506fd1726a38d677b12c6641ba1f77330c332c9ec75d9d18427cedc8647ec319762df7025b8bcc65458e7bac9921fd62b6c3e7f3d6faf0447c5ad15a486ed2a9
-  data.tar.gz: 21dabf3b90b0d6f93183d7e48aa7a3b32614b37edc078f6c538c6e8b810fc5c5f4ae7577ca10d9f6a45cc8732867d2e12f558f7ff5d1fb4fb97ddefe547c80fa
+  metadata.gz: 4f3748ae4c99d94ecb773de86501b720712f25381061055d42e12186f795775ad0a359e7c901b089fa804f82e9fb3d8506a17aeb693d51d14138a80a5b3a8256
+  data.tar.gz: 7126a6536e53cceb34e41c9b606d6974b336bd6afb8d6391a279db5ba16ba3b3939aea4b9efcda8a51c0a2221ef0f1226aa4849625e90cd8e25a2e5900d2299f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    review-retrovert (0.3.4)
+    review-retrovert (0.9.2)
       review (>= 3.2.0, < 4.0)
       thor
 
@@ -60,7 +60,7 @@ GEM
     ffi (1.13.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    image_size (2.0.2)
+    image_size (2.1.0)
     middleware (0.1.0)
     minitest (5.14.1)
     multi_test (0.1.2)
@@ -74,7 +74,7 @@ GEM
       image_size
       rouge
       rubyzip
-    rouge (3.21.0)
+    rouge (3.26.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

data/lib/review/retrovert/cli.rb

@@ -7,6 +7,8 @@ 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', type: :string, default: ''
       method_option "table-empty-replace", desc: 'empty cell(.) in table replace string', type: :string, default: '　'
       def convert(review_starter_configfile, outdir)

data/lib/review/retrovert/converter.rb

@@ -70,7 +70,11 @@ module ReVIEW
       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 +109,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 +140,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 +151,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,10 +164,14 @@ 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')
@@ -263,11 +278,38 @@ module ReVIEW
         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!(/#{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!(/@<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,6 +318,7 @@ 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')
@@ -306,6 +349,10 @@ module ReVIEW
         # special command
         replace_sampleoutput(content)
 
+        if linkurl_footnote
+          add_linkurl_footnote(content)
+        end
+
         # nested command
         replace_block_command_nested_boxed_articles(content)
 
@@ -368,6 +415,45 @@ module ReVIEW
         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.*$/, '')
+            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)))
+          preproc_content_files(outdir, pp, contentdir, catalog.predef())
+          preproc_content_files(outdir, pp, contentdir, catalog.chaps())
+          preproc_content_files(outdir, pp, contentdir, catalog.appendix())
+          preproc_content_files(outdir, pp, contentdir, catalog.postdef())
+        else
+          # copy_contents(outdir)
+          contentsfiles = Pathname.glob(File.join(File.join(@basedir, @srccontentsdir), '*.re')).map(&:basename)
+          preproc_content_files(outdir, pp, contentdir, contentsfiles)
+        end
+      end
+
       def clean_initial_project(outdir)
         FileUtils.rm(File.join(outdir, 'config.yml'))
         FileUtils.rm(File.join(outdir, 'catalog.yml'))
@@ -407,6 +493,11 @@ module ReVIEW
         # updater.backup = false
         updater.execute()
         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.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-retrovert
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - srz_zumix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -74,7 +74,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
@@ -196,7 +195,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