avoid duplication of creating same math. Closes: #1488

kmuto · Mar 25, 2020 · d5fc8fb · d5fc8fb
1 parent 4c985bd
commit d5fc8fb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -428,7 +428,7 @@ Metrics/BlockNesting:
   Max: 4
 
 Metrics/ModuleLength:
-  Max: 200
+  Max: 300
 
 Metrics/ParameterLists:
   Max: 8

diff --git a/lib/review/epubmaker.rb b/lib/review/epubmaker.rb
@@ -166,7 +166,7 @@ def produce(yamlfile, bookname = nil)
         copy_backmatter(basetmpdir)
 
         math_dir = "./#{@config['imagedir']}/_review_math"
-        if @config['imgmath'] && File.exist?(File.join(math_dir, '__IMGMATH_BODY__.tex'))
+        if @config['imgmath'] && File.exist?(File.join(math_dir, '__IMGMATH_BODY__.map'))
           make_math_images(math_dir)
         end
         call_hook('hook_afterbackmatter', basetmpdir)

diff --git a/lib/review/makerhelper.rb b/lib/review/makerhelper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2018 Yuto HAYAMIZU, Kenshi Muto
+# Copyright (c) 2012-2020 Yuto HAYAMIZU, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -112,6 +112,22 @@ def make_math_images(math_dir)
 \\end{document}
 EOB
 
+      hashes = File.readlines(File.join(math_dir, '__IMGMATH_BODY__.map')).sort.uniq
+      File.write(File.join(math_dir, '__IMGMATH_BODY__.map'), hashes.join)
+
+      File.open(File.join(math_dir, '__IMGMATH_BODY__.tex'), 'w') do |f|
+        File.open(File.join(math_dir, '__IMGMATH_BODY__.map')) do |map|
+          map.each_line do |l|
+            l.chomp!
+            f.puts "% #{l}"
+            f.puts File.read(File.join(math_dir, "__IMGMATH_BODY__#{l}.tex"))
+            File.unlink(File.join(math_dir, "__IMGMATH_BODY__#{l}.tex"))
+            f.puts '\\clearpage'
+            f.puts
+          end
+        end
+      end
+
       math_dir = File.realpath(math_dir)
       Dir.mktmpdir do |tmpdir|
         FileUtils.cp([File.join(math_dir, '__IMGMATH_BODY__.tex'),

diff --git a/lib/review/textutils.rb b/lib/review/textutils.rb
@@ -98,9 +98,8 @@ def join_lines_to_paragraph(lines)
 
     def defer_math_image(str, path, key)
       # for Re:VIEW >3
-      File.open(File.join(File.dirname(path), '__IMGMATH_BODY__.tex'), 'a+') do |f|
+      File.open(File.join(File.dirname(path), "__IMGMATH_BODY__#{key}.tex"), 'w') do |f|
         f.puts str
-        f.puts '\\clearpage'
       end
       File.open(File.join(File.dirname(path), '__IMGMATH_BODY__.map'), 'a+') do |f|
         f.puts key