review-retrovert 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6300e07afd5a8a952ed11706cb35595a83fa7cb90b381af357fb3387fb22624
-  data.tar.gz: 649de1a4923bf1f045684af4d14afcf65724dd021f274bea881adf83b5aa38c1
+  metadata.gz: 53d9d91f7b09b23b82d592e511474884b0fa179c39c0ee008a7aad2c69435ddb
+  data.tar.gz: 2f72ede1612ddcc17733fbffa6cab7e9acd1479de4d74f04f6e91af3b0de67bd
 SHA512:
-  metadata.gz: 64661293c30051b5a66ab5cb2c9c4c3a2787508e8659ae26fda67f428594e06870739a9ec7e84a416920e50729f4cf28e5d4da16af496cffd22868e2f0b7b447
-  data.tar.gz: b3dc096f12c61c9ed66456e5a24da4822f3279af9ea4ff83057d8b42e70de8b31ef8cdcd5778c289191b0ceea0e6580fa6e2ebaae644de52061e78128ea91d39
+  metadata.gz: 4e37f04cfa04cdaf146ec9b4db1ac784c2f94f372d43ea43adb2ce451ea01191cb90ad3c2307d6acd405b75178bd5d996e29d292cef6f34235a6e682c7b04fad
+  data.tar.gz: 86f95748aaf68ff476af88c72dd2ab7ac095c92a0f96c2c66ae280b56b5438b20840c01e45d89a1d14bdb8e4ccc43ea21d3dad208c14dc876b5474c825deff05

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    review-retrovert (0.9.8)
+    review-retrovert (0.9.9)
       review (>= 3.0.0)
       thor
 

data/lib/review/retrovert/converter.rb

@@ -127,15 +127,17 @@ module ReVIEW
 
         # words
         words_files = @config['words_file']
-        if words_files.is_a?(Array)
-          new_words_files = []
-          words_files.each do |words_file|
-            new_words_files.push copy_wards(outdir, 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
-          @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
 
         # makeindex_dic
@@ -173,6 +175,12 @@ module ReVIEW
         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
@@ -368,7 +376,13 @@ module ReVIEW
       end
 
       def remove_option_param(content, commands, n, param)
-        content.gsub!(/(?<prev>^\/\/(#{commands.join('|')})(\[.*?\]){#{n-1}}\[.*?)((,|)\s*#{param}=[^,\]]*)(?<post>.*?\])/, '\k<prev>\k<post>')
+        content.gsub!(/(^\/\/(#{commands.join('|')})(\[.*?\]){#{n-1}}\[.*?)((,|)\s*#{param}=[^,\]]*)(.*?\])/) {
+          prev = $1
+          cmd = $2
+          opt = $4
+          post = $6
+          "#{prev}#{post}"
+        }
       end
 
       def remove_starter_options(content)
@@ -385,7 +399,7 @@ module ReVIEW
         # image pos
         remove_option_param(content, ["image"], 3, "pos")
         # list lineno
-        remove_option_param(content, ["list"], 3, "lineno")
+        remove_option_param(content, ["list", "listnum"], 3, "lineno")
       end
 
       # talklist to //#{cmd}[]{ //emlist[]{}... }
@@ -429,7 +443,36 @@ module ReVIEW
         replace_block_command_nested_boxed_article(content, 'emlist')
       end
 
-      def convert_table_option(content)
+      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]
@@ -457,8 +500,16 @@ module ReVIEW
                   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(inner) do |c|
+                  CSV.parse(csv_text) do |c|
                     new_body += Utils::GenerateTsv(c)
                   end
                   content.gsub!(outer, "#{matched}#{new_body}//#{close}")
@@ -479,13 +530,17 @@ module ReVIEW
       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
@@ -535,13 +590,19 @@ module ReVIEW
         delete_block_command_outer(content, 'centering')
 
         # convert starter option
-        convert_table_option(content)
+        convert_starter_option(content)
 
         # delete starter option
         # exclude_exta_option(content, 'cmd', 0)
         starter_caption_to_text(content, 'cmd', 1)
-        exclude_exta_option(content, 'imgtable', 2)
-        exclude_exta_option(content, 'table', 2)
+        exclude_exta_options(content, [
+          'imgtable',
+          'table',
+          # list/listnum の第３引数は言語指定だが、Starter の第３引数と全く異なるため 2 引数にしている
+          # Starter 側が言語指定対応したら修正
+          'list',
+          'listnum',
+        ], 2)
         # exclude_exta_option(content, 'tsize', 1)
         replace_tsize(content)
 
@@ -554,6 +615,8 @@ module ReVIEW
         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)
@@ -718,8 +781,13 @@ module ReVIEW
 
         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!(/(.*)@<br>({}|\$\$|\|\|)$/, "\\1\n\n")
+          content.gsub!(/(.*)@<br>({}|\$\$|\|\|)(.*)$/, "\\1\n\n\\2")
+          content.gsub!(/@<fnbr>({}|\$\$|\|\|)/, '@<br>\1')
         end
 
         # nop replace must be last step

data/lib/review/retrovert/version.rb

@@ -1,5 +1,5 @@
 module ReVIEW
   module Retrovert
-    VERSION = "0.9.8"
+    VERSION = "0.9.9"
   end
 end

data/testdata/mybook/config-retrovert.yml

@@ -5,3 +5,12 @@
 # 上記のようにすることで retrovert 後のプロジェクトでのみ設定を上書きできます
 retrovert:
   chapterlink: null
+
+  # ソースコードハイライトを利用する (rouge,pygmentsには外部gemが必要)
+  highlight:
+  #   html: "rouge"
+    # 「×」が Package inputenc Error: Invalid UTF-8 byte sequence. になるので有効にしない
+    # latex: "listings"
+    # \ などがエスケープされないためエラーになる
+    # latex: "rouge"
+    # latex: "pygments"

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

@@ -1,9 +1,31 @@
 = Retrovert テスト用
 
+//blankline
+
+test@<br>{}
+
+== テスト
+
+=== File
+
 #@mapfile(contents/r0-inner.re)
 #@end
 
-//blankline
+//list[][][file=contents/test.txt]{
+//}
 
-test@<br>{}
+//table[][][csv=on,file=contents/table.csv]{
+//}
+
+=== コマンド
+
+===={subsubtest} Secref テスト用
+
+secref: @<secref>{subsubtest}
+secref: @<secref>{r0-root|subsubtest}
+secref: @<secref>{01-install|RubyとTeXLiveのインストール}
+#@# secref: @<secref>{01-install|Rubyのインストール}
+
+==== footnote bar
 
+//footnote[fnbar][test@<br>{}hoge]

data/testdata/mybook/contents/table.csv

@@ -0,0 +1,4 @@
+Name,Val,Val,Val
+AAA,10,10,10
+BBB,100,100,100
+CCC,1000,1000,1000

data/testdata/mybook/contents/test.txt

@@ -0,0 +1 @@
+TestText-250c8d96-1d5d-434c-a43f-7dc3ad5a588b

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-retrovert
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - srz_zumix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -161,6 +161,8 @@ files:
 - testdata/mybook/contents/99-postface.re
 - testdata/mybook/contents/r0-inner.re
 - testdata/mybook/contents/r0-root.re
+- testdata/mybook/contents/table.csv
+- testdata/mybook/contents/test.txt
 - testdata/mybook/css/normalize.css
 - testdata/mybook/css/webstyle.css
 - testdata/mybook/data/terms.txt