review-retrovert 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d88019dcbdef1f19522028bd668913c7f2100d2774796ca208a7e72df829b3ef
-  data.tar.gz: 4b3605223424275e592269e6fbfd1124275087c322522b0d5cb309434ee202ac
+  metadata.gz: 1800fdc491a64bc922e8164e966bf6f84c4c2c2439a2330e106398ea97c55cc8
+  data.tar.gz: 3b1c672c1c85dc6ec2ca28628c64b4ba0f14263eacdc1952d4ca9427644446bf
 SHA512:
-  metadata.gz: 519813a8c9690db53484fb206084a97c36c8bfe1c230fe09bb623c7d93ce178a81b1bb91eed87a9edfb1c753b345e0d12ca36f50bf8789ea0a6906126b62e771
-  data.tar.gz: '02823e04d7787079bcf94273ab43af37d903c8d8de357fde7c8394094ff88a5e2275e173284496eccf328f74da11c11b8b3d2233814529cb00b4021ff014b19d'
+  metadata.gz: acf0b640bb8ebb2e3f4549103dd73be14e2258f85a720580d8cb0bdb31d5f150e3ffde958dd77672ba16fd3a9b1f5a99e87d65927dfe9277186e529b89298c57
+  data.tar.gz: 5c16364152fc108a2214f1126f3583435dba1eafb080e6c07c3fc20a3de8d7702921e8a89143ce6577323182e10df3da50f9b3f08e07115203e1cbcb6d07a319

data/Gemfile.lock

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

data/lib/review/retrovert/converter.rb

@@ -307,7 +307,11 @@ module ReVIEW
         end
       end
 
-      def add_linkurl_footnote(content)
+      def make_id_label(name)
+        name.gsub(/[^A-Za-z0-9]/, '_')
+      end
+
+      def add_linkurl_footnote(content, filename)
         urls = {}
         content.dup.scan(/(^.*)(@<href>{)(.*?)(,)(.*?)(})(.*)$/) { |m|
           unless m[0].match(/^#@#/)
@@ -316,7 +320,7 @@ module ReVIEW
             url = m[2]
             text = m[4]
             post = m[6]
-            id = "link_auto_footnote#{urls.length}"
+            id = "#{make_id_label(filename)}_link_auto_footnote#{urls.length}"
             urls[id] = url
             content.sub!(/#{Regexp.escape(matched)}$/, "#{prev}@<href>{#{url},#{text}} @<fn>{#{id}} #{post}")
           end
@@ -335,6 +339,7 @@ module ReVIEW
 
       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}')
@@ -374,6 +379,8 @@ module ReVIEW
 
         # fixed lack of options
         content.gsub!(/^\/\/list{/, '//list[][]{')
+        # empty br line to blankline
+        content.gsub!(/^\s*@<br>{}\s*$/, '//blankline')
 
         if Gem::Version.new(ReVIEW::VERSION) >= Gem::Version.new('4.0.0')
           # empty caption is not allow
@@ -384,7 +391,7 @@ module ReVIEW
         replace_sampleoutput(content)
 
         if linkurl_footnote
-          add_linkurl_footnote(content)
+          add_linkurl_footnote(content, filename)
         end
 
         # # br to blankline

data/lib/review/retrovert/version.rb

@@ -1,5 +1,5 @@
 module ReVIEW
   module Retrovert
-    VERSION = "0.9.4"
+    VERSION = "0.9.5"
   end
 end

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

@@ -2,3 +2,8 @@
 
 #@mapfile(contents/r0-inner.re)
 #@end
+
+@<br>{}
+
+test@<br>{}
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-retrovert
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - srz_zumix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor