review 3.1.0 → 5.0.0

data/doc/quickstart.md

@@ -9,7 +9,7 @@ Re:VIEW is free software under the terms of the GNU Lesser General Public Licens
 
 This article describes how to setup Re:VIEW and use it.
 
-The supported version of the article is Re:VIEW 3.0.
+The supported version of the article is Re:VIEW 4.2.
 
 ## Set up Re:VIEW
 
@@ -59,7 +59,7 @@ $ git pull
 
 ## Writing Re:VIEW Document
 
-### Generating template fiels
+### Generating template files
 
 After setup, you can use `review-init` command to generate Re:VIEW project directory.
 
@@ -72,14 +72,23 @@ $ ls hello
 Rakefile     catalog.yml  config.yml   hello.re     images/      layouts/     sty/         style.css
 ```
 
+If your purpose is to create a PDF using TeX, it is a good idea to use the wizard mode for basic layouting in a web browser. Add `-w` option to review-init.
+
+(notice: currently wizard UI supports only Japanese language)
+
+```bash
+$ review-init -w hello
+(access http://localhost:18000 on Web browser)
+```
+
 In `hello` directory, many files are generated.
 
 * `*.re` : Re:VIEW format file.
 * config.yml : configuration file
+* config-ebook.yml : configuration file for ebook (when using the wizard mode)
 * catalog.yml : catalog file (for TOC)
 * Rakefile : rule file for `rake` command
 * images : folder for images
-* layouts : forlder for layout files
 * style.css : sample stylesheet
 * sty : style files for LaTeX
 * doc : various documents (including this document)
@@ -116,29 +125,38 @@ The web site of Re:VIEW is @<tt>{https://reviewml.org/}.
 
 You should use UTF-8 as encodings in text files.
 
-### generating PDF, EPUB, and plain-text
+### generating PDF, EPUB, plain-text, and InDesign XML
+
+To convert files in the project, use review-*maker command.
 
-You can generate a PDF file with `review-pdfmaker` command.  Also you can generate an EPUB file with `review-epubmaker` command, and can generate an plain-text file with 'review-textmaker' command.
+- review-pdfmaker: generate PDF
+- review-epubmaker: generate EPUB
+- review-textmaker: genrate plaintext
+- review-idgxmlmaker: genrate InDesign XML
 
-To generate PDF, you should install TeXLive 2012 or later.  To generate EPUB, you should install zip command.
+To generate PDF, you should install TeXLive 2012 or later. To generate EPUB, you should install zip command.
 When you want to use MathML, you should install [MathML library](http://www.hinet.mydns.jp/?mathml.rb)
 
-Each maker need `config.yml`, configuration YAML files.  `review-init` command generates `config.yml` in default.
+Each maker need `config.yml`, configuration YAML files. `review-init` command generates `config.yml` in default.
 
 ```bash
-$ review-pdfmaker config.yml     ## generate PDF
-$ review-epubmaker config.yml    ## generate EPUB
-$ review-textmaker config.yml    ## generate text with decoration
-$ review-textmaker -n config.yml ## generate text without decoration
+$ review-pdfmaker config.yml       ## generate PDF
+$ review-pdfmaker config-ebook.yml ## generate PDF (for ebook)
+$ review-epubmaker config.yml      ## generate EPUB
+$ review-textmaker config.yml      ## generate text with decoration
+$ review-textmaker -n config.yml   ## generate text without decoration
+$ review-idgxmlmaker config.yml    ## generate InDesign XML
 ```
 
 You also can generate them with Rake.
 
 ```bash
 $ rake pdf       ## generate PDF
+$ REVIEW_CONFIG_FILE=config-ebook.yml rake pdf       ## generate PDF (for ebook)
 $ rake epub      ## generate EPUB
 $ rake text      ## generate text with decoration
 $ rake plaintext ## generate text without decoration
+$ rake idgxml    ## generate InDesign XML
 ```
 
 There is a sample YAML file [config.yml.sample](https://github.com/kmuto/review/blob/master/doc/config.yml.sample) in the same directory of this document.
@@ -205,17 +223,20 @@ $ review-vol
 You can also use `review-index` command to generate header list.
 
 ```bash
-$ review-index --level <heading level> -a
+$ review-index --level <heading level>
+$ review-index --level <heading level> -d  ## show volumes also
 ```
 
+review-vol and review-index can have large differences in the number of characters, lines, and pages. While review-vol only estimates from the file, review-index actually compiles and calculates.
+
 ## how to update the document folder to the new Re:VIEW version
 
-Re:VIEW is updated regularly. We Re:VIEW team watch the backward compatibility carefully, but if you want to use the features in the new version, you can use review-update command to update the document folder.
+Re:VIEW is updated regularly. We Re:VIEW team watch the backward compatibility carefully, but if you want to use the features in the new version, you can use review-update command to update the project folder.
 
 ```bash
 $ review-update
-** review-update updates your project to 3.0.0 **
-config.yml: Update 'review_version' to '3.0'? [y]/n
+** review-update updates your project to 5.0.0 **
+config.yml: Update 'review_version' to '5.0'? [y]/n
 Rakefile will be overridden with Re:VIEW version (/.../review/samples/sample-book/src/Rakefile). Do you really proceed? [y]/n
 lib/tasks/review.rake will be overridden with Re:VIEW version (/.../review/samples/sample-book/src/lib/tasks/review.rake). Do you really proceed? [y]/n
 INFO: new file /.../sty/plistings.sty is created.
@@ -231,7 +252,7 @@ Finished.
 
 ## Copyright
 
-The original author of Re:VIEW is Minero Aoki. The current maintainer is Kenshi Muto(@kmuto), and committers are Masayoshi Takahashi and Masanori Kado (February 2019).
+The original author of Re:VIEW is Minero Aoki. The current maintainer is Kenshi Muto(@kmuto), and committers are Masayoshi Takahashi and Masanori Kado (March 2020).
 
 If you want to report bugs and patches, or to get more information, see:
 

data/lib/epubmaker/content.rb

@@ -1,6 +1,6 @@
 # = content.rb -- Content object for EPUBMaker.
 #
-# Copyright (c) 2010-2017 Kenshi Muto
+# Copyright (c) 2010-2020 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -73,11 +73,12 @@ module EPUBMaker
     # Complement other parameters by using file parameter.
     def complement
       if @id.nil?
-        @id = @file.gsub(%r{[\\/\. ]}, '-')
+        @id = @file.gsub(%r{[\\/. ]}, '-')
       end
       if @id =~ /\A[^a-z]/i
         @id = "rv-#{@id}"
       end
+      @id = CGI.escape(@id).gsub('%', '_25_')
 
       if !@file.nil? && @media.nil?
         @media = @file.sub(/.+\./, '').downcase

data/lib/epubmaker/epubcommon.rb

@@ -10,7 +10,11 @@
 
 require 'review/i18n'
 require 'review/template'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi/util'
+end
 
 module EPUBMaker
   # EPUBCommon is the common class for EPUB producer.
@@ -22,6 +26,10 @@ module EPUBMaker
       @body_ext = nil
     end
 
+    def h(str)
+      CGI.escapeHTML(str)
+    end
+
     # Return mimetype content.
     def mimetype
       'application/epub+zip'
@@ -36,10 +44,9 @@ module EPUBMaker
       if @producer.config['coverimage']
         file = nil
         @producer.contents.each do |item|
-          if !item.media.start_with?('image') || item.file !~ /#{@producer.config["coverimage"]}\Z/
+          if !item.media.start_with?('image') || item.file !~ /#{@producer.config['coverimage']}\Z/
             next
           end
-
           s << %Q(    <meta name="cover" content="#{item.id}"/>\n)
           file = item.file
           break
@@ -60,10 +67,10 @@ module EPUBMaker
     def ncx_doctitle
       <<EOT
   <docTitle>
-    <text>#{CGI.escapeHTML(@producer.config['title'])}</text>
+    <text>#{h(@producer.config['title'])}</text>
   </docTitle>
   <docAuthor>
-    <text>#{@producer.config['aut'].nil? ? '' : CGI.escapeHTML(join_with_separator(@producer.config['aut'], ReVIEW::I18n.t('names_splitter')))}</text>
+    <text>#{@producer.config['aut'].nil? ? '' : h(join_with_separator(@producer.config['aut'], ReVIEW::I18n.t('names_splitter')))}</text>
   </docAuthor>
 EOT
     end
@@ -73,7 +80,7 @@ EOT
   <navMap>
     <navPoint id="top" playOrder="1">
       <navLabel>
-        <text>#{CGI.escapeHTML(@producer.config['title'])}</text>
+        <text>#{h(@producer.config['title'])}</text>
       </navLabel>
       <content src="#{@producer.config['cover']}"/>
     </navPoint>
@@ -85,7 +92,7 @@ EOT
         s << <<EOT
     <navPoint id="toc" playOrder="#{nav_count}">
       <navLabel>
-        <text>#{CGI.escapeHTML(@producer.res.v('toctitle'))}</text>
+        <text>#{h(@producer.res.v('toctitle'))}</text>
       </navLabel>
       <content src="#{@producer.config['bookname']}-toc.#{@producer.config['htmlext']}"/>
     </navPoint>
@@ -101,7 +108,7 @@ EOT
         s << <<EOT
     <navPoint id="nav-#{nav_count}" playOrder="#{nav_count}">
       <navLabel>
-        <text>#{indent[level]}#{CGI.escapeHTML(item.title)}</text>
+        <text>#{indent[level]}#{h(item.title)}</text>
       </navLabel>
       <content src="#{item.file}"/>
     </navPoint>
@@ -132,21 +139,21 @@ EOT
         raise "coverimage #{@producer.config['coverimage']} not found. Abort." unless file
         @body = <<-EOT
   <div id="cover-image" class="cover-image">
-    <img src="#{file}" alt="#{CGI.escapeHTML(@producer.config.name_of('title'))}" class="max"/>
+    <img src="#{file}" alt="#{h(@producer.config.name_of('title'))}" class="max"/>
   </div>
         EOT
       else
         @body = <<-EOT
-<h1 class="cover-title">#{CGI.escapeHTML(@producer.config.name_of('title'))}</h1>
+<h1 class="cover-title">#{h(@producer.config.name_of('title'))}</h1>
         EOT
         if @producer.config['subtitle']
           @body << <<-EOT
-<h2 class="cover-subtitle">#{CGI.escapeHTML(@producer.config.name_of('subtitle'))}</h2>
+<h2 class="cover-subtitle">#{h(@producer.config.name_of('subtitle'))}</h2>
           EOT
         end
       end
 
-      @title = CGI.escapeHTML(@producer.config.name_of('title'))
+      @title = h(@producer.config.name_of('title'))
       @language = @producer.config['language']
       @stylesheets = @producer.config['stylesheet']
       tmplfile = if @producer.config['htmlversion'].to_i == 5
@@ -162,7 +169,7 @@ EOT
     # NOTE: this method is not used yet.
     #       see lib/review/epubmaker.rb#build_titlepage
     def titlepage
-      @title = CGI.escapeHTML(@producer.config.name_of('title'))
+      @title = h(@producer.config.name_of('title'))
 
       @body = <<EOT
   <h1 class="tp-title">#{@title}</h1>
@@ -170,7 +177,7 @@ EOT
 
       if @producer.config['subtitle']
         @body << <<EOT
-  <h2 class="tp-subtitle">#{CGI.escapeHTML(@producer.config.name_of('subtitle'))}</h2>
+  <h2 class="tp-subtitle">#{h(@producer.config.name_of('subtitle'))}</h2>
 EOT
       end
 
@@ -180,7 +187,7 @@ EOT
     <br />
     <br />
   </p>
-  <h2 class="tp-author">#{CGI.escapeHTML(join_with_separator(@producer.config.names_of('aut'), ReVIEW::I18n.t('names_splitter')))}</h2>
+  <h2 class="tp-author">#{h(join_with_separator(@producer.config.names_of('aut'), ReVIEW::I18n.t('names_splitter')))}</h2>
 EOT
       end
 
@@ -193,7 +200,7 @@ EOT
     <br />
     <br />
   </p>
-  <h3 class="tp-publisher">#{CGI.escapeHTML(join_with_separator(publisher, ReVIEW::I18n.t('names_splitter')))}</h3>
+  <h3 class="tp-publisher">#{h(join_with_separator(publisher, ReVIEW::I18n.t('names_splitter')))}</h3>
 EOT
       end
 
@@ -210,18 +217,18 @@ EOT
 
     # Return colophon content.
     def colophon
-      @title = CGI.escapeHTML(@producer.res.v('colophontitle'))
+      @title = h(@producer.res.v('colophontitle'))
       @body = <<EOT
   <div class="colophon">
 EOT
 
       if @producer.config['subtitle'].nil?
         @body << <<EOT
-    <p class="title">#{CGI.escapeHTML(@producer.config.name_of('title'))}</p>
+    <p class="title">#{h(@producer.config.name_of('title'))}</p>
 EOT
       else
         @body << <<EOT
-    <p class="title">#{CGI.escapeHTML(@producer.config.name_of('title'))}<br /><span class="subtitle">#{CGI.escapeHTML(@producer.config.name_of('subtitle'))}</span></p>
+    <p class="title">#{h(@producer.config.name_of('title'))}<br /><span class="subtitle">#{h(@producer.config.name_of('subtitle'))}</span></p>
 EOT
       end
 
@@ -230,7 +237,7 @@ EOT
       @body << %Q(    <table class="colophon">\n)
       @body << @producer.config['colophon_order'].map do |role|
         if @producer.config[role]
-          %Q(      <tr><th>#{CGI.escapeHTML(@producer.res.v(role))}</th><td>#{CGI.escapeHTML(join_with_separator(@producer.config.names_of(role), ReVIEW::I18n.t('names_splitter')))}</td></tr>\n)
+          %Q(      <tr><th>#{h(@producer.res.v(role))}</th><td>#{h(join_with_separator(@producer.config.names_of(role), ReVIEW::I18n.t('names_splitter')))}</td></tr>\n)
         else
           ''
         end
@@ -239,7 +246,7 @@ EOT
       @body << %Q(      <tr><th>ISBN</th><td>#{@producer.isbn_hyphen}</td></tr>\n) if @producer.isbn_hyphen
       @body << %Q(    </table>\n)
       if @producer.config['rights'] && !@producer.config['rights'].empty?
-        @body << %Q(    <p class="copyright">#{join_with_separator(@producer.config.names_of('rights').map { |m| CGI.escapeHTML(m) }, '<br />')}</p>\n)
+        @body << %Q(    <p class="copyright">#{join_with_separator(@producer.config.names_of('rights').map { |m| h(m) }, '<br />')}</p>\n)
       end
       @body << %Q(  </div>\n)
 
@@ -262,11 +269,11 @@ EOT
           items.each_with_index do |item, rev|
             editstr = edit == 0 ? ReVIEW::I18n.t('first_edition') : ReVIEW::I18n.t('nth_edition', (edit + 1).to_s)
             revstr = ReVIEW::I18n.t('nth_impression', (rev + 1).to_s)
-            if item =~ /\A\d+\-\d+\-\d+\Z/
+            if item =~ /\A\d+-\d+-\d+\Z/
               buf << %Q(      <p>#{ReVIEW::I18n.t('published_by1', [date_to_s(item), editstr + revstr])}</p>\n)
-            elsif item =~ /\A(\d+\-\d+\-\d+)[\s　](.+)/
+            elsif item =~ /\A(\d+-\d+-\d+)[\s　](.+)/
               # custom date with string
-              item.match(/\A(\d+\-\d+\-\d+)[\s　](.+)/) do |m|
+              item.match(/\A(\d+-\d+-\d+)[\s　](.+)/) do |m|
                 buf << %Q(      <p>#{ReVIEW::I18n.t('published_by3', [date_to_s(m[1]), m[2]])}</p>\n)
               end
             else
@@ -290,9 +297,9 @@ EOT
 
     # Return own toc content.
     def mytoc
-      @title = CGI.escapeHTML(@producer.res.v('toctitle'))
+      @title = h(@producer.res.v('toctitle'))
 
-      @body = %Q(  <h1 class="toc-title">#{CGI.escapeHTML(@producer.res.v('toctitle'))}</h1>\n)
+      @body = %Q(  <h1 class="toc-title">#{h(@producer.res.v('toctitle'))}</h1>\n)
       if @producer.config['epubmaker']['flattoc'].nil?
         @body << hierarchy_ncx('ul')
       else
@@ -386,7 +393,7 @@ EOT
       @producer.contents.each do |item|
         next if !item.notoc.nil? || item.level.nil? || item.file.nil? || item.title.nil? || item.level > @producer.config['toclevel'].to_i
         is = indent == true ? '　' * item.level : ''
-        s << %Q(<li><a href="#{item.file}">#{is}#{CGI.escapeHTML(item.title)}</a></li>\n)
+        s << %Q(<li><a href="#{item.file}">#{is}#{h(item.title)}</a></li>\n)
       end
       s << %Q(</#{type}>\n)
 

data/lib/epubmaker/epubv2.rb

@@ -9,14 +9,13 @@
 #
 
 require 'epubmaker/epubcommon'
-require 'cgi'
 require 'epubmaker/zip_exporter'
 
 module EPUBMaker
   # EPUBv2 is EPUB version 2 producer.
   class EPUBv2 < EPUBCommon
     # Construct object with parameter hash +config+ and message resource hash +res+.
-    def initialize(producer)
+    def initialize(producer) # rubocop:disable Lint/UselessMethodDefinition
       super
     end
 
@@ -37,9 +36,9 @@ module EPUBMaker
       %w[title language date type format source description relation coverage subject rights].each do |item|
         next unless @producer.config[item]
         if @producer.config[item].is_a?(Array)
-          s << @producer.config.names_of(item).map { |i| %Q(    <dc:#{item}>#{CGI.escapeHTML(i)}</dc:#{item}>\n) }.join
+          s << @producer.config.names_of(item).map { |i| %Q(    <dc:#{item}>#{h(i)}</dc:#{item}>\n) }.join
         else
-          s << %Q(    <dc:#{item}>#{CGI.escapeHTML(@producer.config.name_of(item))}</dc:#{item}>\n)
+          s << %Q(    <dc:#{item}>#{h(@producer.config.name_of(item).to_s)}</dc:#{item}>\n)
         end
       end
 
@@ -54,7 +53,7 @@ module EPUBMaker
       %w[aut a-adp a-ann a-arr a-art a-asn a-aqt a-aft a-aui a-ant a-bkp a-clb a-cmm a-dsr a-edt a-ill a-lyr a-mdc a-mus a-nrt a-oth a-pht a-prt a-red a-rev a-spn a-ths a-trc a-trl].each do |role|
         next unless @producer.config[role]
         @producer.config.names_of(role).each do |v|
-          s << %Q(    <dc:creator opf:role="#{role.sub('a-', '')}">#{CGI.escapeHTML(v)}</dc:creator>\n)
+          s << %Q(    <dc:creator opf:role="#{role.sub('a-', '')}">#{h(v)}</dc:creator>\n)
         end
       end
 
@@ -62,7 +61,7 @@ module EPUBMaker
       %w[adp ann arr art asn aqt aft aui ant bkp clb cmm dsr edt ill lyr mdc mus nrt oth pht prt red rev spn ths trc trl].each do |role|
         next unless @producer.config[role]
         @producer.config.names_of(role).each do |v|
-          s << %Q(    <dc:contributor opf:role="#{role}">#{CGI.escapeHTML(v)}</dc:contributor>\n)
+          s << %Q(    <dc:contributor opf:role="#{role}">#{h(v)}</dc:contributor>\n)
           if role == 'prt'
             s << %Q(    <dc:publisher>#{v}</dc:publisher>\n)
           end

data/lib/epubmaker/epubv3.rb

@@ -26,6 +26,7 @@ module EPUBMaker
     # Return opf file content.
     def opf
       @opf_metainfo = opf_metainfo
+      @opf_coverimage = opf_coverimage
       @opf_manifest = opf_manifest
       @opf_toc = opf_tocx
       @package_attrs = ''
@@ -39,6 +40,7 @@ module EPUBMaker
       ReVIEW::Template.load(tmplfile).result(binding)
     end
 
+    # rubocop:disable Metrics/PerceivedComplexity
     def opf_metainfo
       s = ''
       %w[title language date type format source description relation coverage subject rights].each do |item|
@@ -46,23 +48,23 @@ module EPUBMaker
         if @producer.config[item].is_a?(Array)
           @producer.config[item].each_with_index do |v, i|
             if v.is_a?(Hash)
-              s << %Q(    <dc:#{item} id="#{item}-#{i}">#{CGI.escapeHTML(v['name'])}</dc:#{item}>\n)
+              s << %Q(    <dc:#{item} id="#{item}-#{i}">#{h(v['name'])}</dc:#{item}>\n)
               v.each_pair do |name, val|
                 next if name == 'name'
-                s << %Q(    <meta refines="##{item}-#{i}" property="#{name}">#{CGI.escapeHTML(val)}</meta>\n)
+                s << %Q(    <meta refines="##{item}-#{i}" property="#{name}">#{h(val)}</meta>\n)
               end
             else
-              s << %Q(    <dc:#{item} id="#{item}-#{i}">#{CGI.escapeHTML(v.to_s)}</dc:#{item}>\n)
+              s << %Q(    <dc:#{item} id="#{item}-#{i}">#{h(v.to_s)}</dc:#{item}>\n)
             end
           end
         elsif @producer.config[item].is_a?(Hash)
-          s << %Q(    <dc:#{item} id="#{item}">#{CGI.escapeHTML(@producer.config[item]['name'])}</dc:#{item}>\n)
+          s << %Q(    <dc:#{item} id="#{item}">#{h(@producer.config[item]['name'])}</dc:#{item}>\n)
           @producer.config[item].each_pair do |name, val|
             next if name == 'name'
-            s << %Q(    <meta refines="##{item}" property="#{name}">#{CGI.escapeHTML(val)}</meta>\n)
+            s << %Q(    <meta refines="##{item}" property="#{name}">#{h(val)}</meta>\n)
           end
         else
-          s << %Q(    <dc:#{item} id="#{item}">#{CGI.escapeHTML(@producer.config[item].to_s)}</dc:#{item}>\n)
+          s << %Q(    <dc:#{item} id="#{item}">#{h(@producer.config[item].to_s)}</dc:#{item}>\n)
         end
       end
 
@@ -80,14 +82,14 @@ module EPUBMaker
         next unless @producer.config[role]
         @producer.config[role].each_with_index do |v, i|
           if v.is_a?(Hash)
-            s << %Q(    <dc:creator id="#{role}-#{i}">#{CGI.escapeHTML(v['name'])}</dc:creator>\n)
+            s << %Q(    <dc:creator id="#{role}-#{i}">#{h(v['name'])}</dc:creator>\n)
             s << %Q(    <meta refines="##{role}-#{i}" property="role" scheme="marc:relators">#{role.sub('a-', '')}</meta>\n)
             v.each_pair do |name, val|
               next if name == 'name'
-              s << %Q(    <meta refines="##{role.sub('a-', '')}-#{i}" property="#{name}">#{CGI.escapeHTML(val)}</meta>\n)
+              s << %Q(    <meta refines="##{role.sub('a-', '')}-#{i}" property="#{name}">#{h(val)}</meta>\n)
             end
           else
-            s << %Q(    <dc:creator id="#{role}-#{i}">#{CGI.escapeHTML(v)}</dc:creator>\n)
+            s << %Q(    <dc:creator id="#{role}-#{i}">#{h(v)}</dc:creator>\n)
             s << %Q(    <meta refines="##{role}-#{i}" property="role" scheme="marc:relators">#{role.sub('a-', '')}</meta>\n)
           end
         end
@@ -98,27 +100,27 @@ module EPUBMaker
         next unless @producer.config[role]
         @producer.config[role].each_with_index do |v, i|
           if v.is_a?(Hash)
-            s << %Q(    <dc:contributor id="#{role}-#{i}">#{CGI.escapeHTML(v['name'])}</dc:contributor>\n)
+            s << %Q(    <dc:contributor id="#{role}-#{i}">#{h(v['name'])}</dc:contributor>\n)
             s << %Q(    <meta refines="##{role}-#{i}" property="role" scheme="marc:relators">#{role}</meta>\n)
             v.each_pair do |name, val|
               next if name == 'name'
-              s << %Q(    <meta refines="##{role}-#{i}" property="#{name}">#{CGI.escapeHTML(val)}</meta>\n)
+              s << %Q(    <meta refines="##{role}-#{i}" property="#{name}">#{h(val)}</meta>\n)
             end
           else
-            s << %Q(    <dc:contributor id="#{role}-#{i}">#{CGI.escapeHTML(v)}</dc:contributor>\n)
+            s << %Q(    <dc:contributor id="#{role}-#{i}">#{h(v)}</dc:contributor>\n)
             s << %Q(    <meta refines="##{role}-#{i}" property="role" scheme="marc:relators">#{role}</meta>\n)
           end
 
           if %w[prt pbl].include?(role)
             if v.is_a?(Hash)
-              s << %Q(    <dc:publisher id="pub-#{role}-#{i}">#{CGI.escapeHTML(v['name'])}</dc:publisher>\n)
+              s << %Q(    <dc:publisher id="pub-#{role}-#{i}">#{h(v['name'])}</dc:publisher>\n)
               s << %Q(    <meta refines="#pub-#{role}-#{i}" property="role" scheme="marc:relators">#{role}</meta>\n)
               v.each_pair do |name, val|
                 next if name == 'name'
-                s << %Q(    <meta refines="#pub-#{role}-#{i}" property="#{name}">#{CGI.escapeHTML(val)}</meta>\n)
+                s << %Q(    <meta refines="#pub-#{role}-#{i}" property="#{name}">#{h(val)}</meta>\n)
               end
             else
-              s << %Q(    <dc:publisher id="pub-#{role}-#{i}">#{CGI.escapeHTML(v)}</dc:publisher>\n)
+              s << %Q(    <dc:publisher id="pub-#{role}-#{i}">#{h(v)}</dc:publisher>\n)
               s << %Q(    <meta refines="#pub-#{role}-#{i}" property="role" scheme="marc:relators">prt</meta>\n)
             end
           end
@@ -128,12 +130,13 @@ module EPUBMaker
       ## add custom <meta> element
       if @producer.config['opf_meta'].present?
         @producer.config['opf_meta'].each do |k, v|
-          s << %Q(    <meta property="#{k}">#{CGI.escapeHTML(v)}</meta>\n)
+          s << %Q(    <meta property="#{k}">#{h(v)}</meta>\n)
         end
       end
 
       s
     end
+    # rubocop:enable Metrics/PerceivedComplexity
 
     def opf_manifest
       s = ''
@@ -205,11 +208,11 @@ EOT
 
       @body = <<EOT
   <nav xmlns:epub="http://www.idpf.org/2007/ops" epub:type="toc" id="toc">
-  <h1 class="toc-title">#{CGI.escapeHTML(@producer.res.v('toctitle'))}</h1>
+  <h1 class="toc-title">#{h(@producer.res.v('toctitle'))}</h1>
 #{ncx_main}  </nav>
 EOT
 
-      @title = CGI.escapeHTML(@producer.res.v('toctitle'))
+      @title = h(@producer.res.v('toctitle'))
       @language = @producer.config['language']
       @stylesheets = @producer.config['stylesheet']
       tmplfile = File.expand_path('./html/layout-html5.html.erb', ReVIEW::Template::TEMPLATE_DIR)