review 4.1.0 → 5.2.0

data/templates/latex/review-jsbook/reviewmacro.sty

@@ -4,6 +4,11 @@
 % Re:VIEW 2互換のreviewmacro.sty(装飾カスタマイズ)内容
 \RequirePackage{review-style}
 
+% 囲み飾りの設定
+\ifdefined\reviewboxsetting%
+  \RequirePackage{review-tcbox}
+\fi
+
 % ユーザー固有の定義
 \RequirePackage{review-custom}
 

data/templates/opf/epubv2.opf.erb

@@ -7,15 +7,15 @@
 <%= @opf_manifest %>
 <%= @opf_toc %>
   <guide>
-    <reference type="cover" title="<%= @producer.res.v('covertitle') %>" href="<%= @producer.config['cover'] %>"/>
-<% if @producer.config['titlepage'].present? %>
-    <reference type="title-page" title="<%= @producer.res.v('titlepagetitle') %>" href="titlepage.<%= @producer.config['htmlext'] %>"/>
+    <reference type="cover" title="<%= ReVIEW::I18n.t('covertitle') %>" href="<%= @config['cover'] %>"/>
+<% if @config['titlepage'].present? %>
+    <reference type="title-page" title="<%= ReVIEW::I18n.t('titlepagetitle') %>" href="titlepage.<%= @config['htmlext'] %>"/>
 <% end %>
-<% if @producer.config['mytoc'].present? %>
-    <reference type="toc" title="<%= @producer.res.v('toctitle') %>" href="<%= @producer.config['bookname'] %>-toc.<%= @producer.config['htmlext'] %>"/>
+<% if @config['mytoc'].present? %>
+    <reference type="toc" title="<%= ReVIEW::I18n.t('toctitle') %>" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>"/>
 <% end %>
-<% if @producer.config['colophon'].present? %>
-    <reference type="colophon" title="<%= @producer.res.v('colophontitle') %>" href="colophon.<%= @producer.config['htmlext'] %>"/>
+<% if @config['colophon'].present? %>
+    <reference type="colophon" title="<%= ReVIEW::I18n.t('colophontitle') %>" href="colophon.<%= @config['htmlext'] %>"/>
 <% end %>
   </guide>
 </package>

data/templates/opf/epubv3.opf.erb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="<%= @producer.config['language'] %>"<%= @package_attrs %>>
+<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="<%= @config['language'] %>"<%= @package_attrs %>>
   <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
 <%= @opf_metainfo %>
 <%= @opf_coverimage %>
@@ -7,13 +7,13 @@
 <%= @opf_manifest %>
 <%= @opf_toc %>
   <guide>
-    <reference type="cover" title="<%= @producer.res.v('covertitle') %>" href="<%= @producer.config['cover'] %>"/>
-<% if @producer.config["titlepage"].present? %>
-    <reference type="title-page" title="<%= @producer.res.v('titlepagetitle') %>" href="titlepage.<%= @producer.config['htmlext'] %>"/>
+    <reference type="cover" title="<%= ReVIEW::I18n.t('covertitle') %>" href="<%= @config['cover'] %>"/>
+<% if @config["titlepage"].present? %>
+    <reference type="title-page" title="<%= ReVIEW::I18n.t('titlepagetitle') %>" href="titlepage.<%= @config['htmlext'] %>"/>
 <% end %>
-    <reference type="toc" title="<%= @producer.res.v('toctitle') %>" href="<%= @producer.config['bookname'] %>-toc.<%= @producer.config['htmlext'] %>"/>
-<% if @producer.config['colophon'].present? %>
-    <reference type="colophon" title="<%= @producer.res.v('colophontitle') %>" href="colophon.<%= @producer.config['htmlext'] %>"/>
+    <reference type="toc" title="<%= ReVIEW::I18n.t('toctitle') %>" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>"/>
+<% if @config['colophon'].present? %>
+    <reference type="colophon" title="<%= ReVIEW::I18n.t('colophontitle') %>" href="colophon.<%= @config['htmlext'] %>"/>
 <% end %>
   </guide>
 </package>

data/templates/opf/opf_manifest_epubv2.opf.erb

@@ -0,0 +1,10 @@
+  <manifest>
+    <item id="ncx" href="<%= @config['bookname'] %>.ncx" media-type="application/x-dtbncx+xml"/>
+    <item id="<%= @config['bookname'] %>" href="<%= @config['cover'] %>" media-type="application/xhtml+xml"/>
+<% if @config['toc'] && @config['mytoc'] %>
+    <item id="toc" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" media-type="application/xhtml+xml"/>
+<% end %>
+<% @items.each do |item| %>
+    <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"/>
+<% end %>
+  </manifest>

data/templates/opf/opf_manifest_epubv3.opf.erb

@@ -0,0 +1,10 @@
+  <manifest>
+    <item properties="nav" id="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" media-type="application/xhtml+xml"/>
+    <item id="<%= @config['bookname'] %>" href="<%= @config['cover'] %>" media-type="application/xhtml+xml"/>
+<% if @coverimage %>
+    <item properties="cover-image" id="cover-<%= @coverimage.id %>" href="<%= @coverimage.file %>" media-type="<%= @coverimage.media %>"/>
+<% end %>
+<% @items.each do |item| %>
+    <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"<%= item.properties_attribute %>/>
+<% end %>
+  </manifest>

data/templates/opf/opf_metainfo_epubv2.opf.erb

@@ -0,0 +1,17 @@
+<% @dc_items.each do |item| %>
+    <<%= item[:tag] %>><%= h(item[:val]) %></<%= item[:tag] %>>
+<% end %>
+<% if @config['isbn'] %>
+    <dc:identifier id="BookId" opf:scheme="ISBN"><%= @config['isbn'] %></dc:identifier>
+<% else %>
+    <dc:identifier id="BookId"><%= @config['urnid'] %></dc:identifier>
+<% end %>
+<% @creators.each do |creator| %>
+    <dc:creator opf:role="<%= creator[:role] %>"><%= h(creator[:val]) %></dc:creator>
+<% end %>
+<% @contributers.each do |contributer| %>
+    <dc:contributor opf:role="<%= contributer[:role] %>"><%= h(contributer[:val]) %></dc:contributor>
+<%   if contributer[:role] == 'prt' %>
+    <dc:publisher><%= h(contributer[:val]) %></dc:publisher>
+<%   end %>
+<% end %>

data/templates/opf/opf_metainfo_epubv3.opf.erb

@@ -0,0 +1,49 @@
+<%# --- DC items --- %>
+<% @dc_items.each do |item| %>
+    <<%= item[:tag] %> id="<%= item[:id] %>"><%= item[:val] %></<%= item[:tag] %>>
+<%   item[:refines].each do | refine | %>
+    <meta refines="#<%= item[:id] %>" property="<%= refine[:name] %>"><%= h(refine[:val]) %></meta>
+<%   end %>
+<% end %>
+    <meta property="dcterms:modified"><%= @config['modified'] %></meta>
+<% if @config['isbn'] %>
+    <dc:identifier id="BookId"><%= @config['isbn'] %></dc:identifier>
+<% else %>
+    <dc:identifier id="BookId"><%= @config['urnid'] %></dc:identifier>
+<% end %>
+<%# --- creator --- %>
+<% @creators.each do |creator| %>
+    <dc:creator id="<%= creator[:id] %>"><%= creator[:val] %></dc:creator>
+<%   creator[:refines].each do |refine| %>
+<%     if refine[:scheme] %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>" scheme="<%= refine[:scheme] %>"><%= refine[:val] %></meta>
+<%     else %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>"><%= refine[:val] %></meta>
+<%     end %>
+<%   end %>
+<% end %>
+<%# --- contributer --- %>
+<% @contributers.each do |contributer| %>
+    <dc:contributor id="<%= contributer[:id] %>"><%= h(contributer[:val]) %></dc:contributor>
+<%   contributer[:refines].each do |refine| %>
+<%     if refine[:scheme] %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>" scheme="<%= refine[:scheme] %>"><%= refine[:val] %></meta>
+<%     else %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>"><%= refine[:val] %></meta>
+<%     end %>
+<%   end %>
+<%   if contributer[:pub_id] %>
+    <dc:publisher id="<%= contributer[:pub_id] %>"><%= h(contributer[:pub_val]) %></dc:publisher>
+<%     contributer[:pub_refines].each do |refine| %>
+<%       if refine[:scheme] %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>" scheme="<%= refine[:scheme] %>"><%= refine[:val] %></meta>
+<%       else %>
+    <meta refines="#<%= refine[:id] %>" property="<%= refine[:property]%>"><%= refine[:val] %></meta>
+<%       end %>
+<%     end %>
+<%   end %>
+<% end %>
+<%# --- other --- %>
+<% (@config['opf_meta'] || [] ).each do |k, v| %>
+    <meta property="<%= h(k) %>"><%= h(v) %></meta>
+<% end %>

data/templates/opf/opf_tocx_epubv2.opf.erb

@@ -0,0 +1,9 @@
+  <spine toc="ncx">
+    <itemref idref="<%= @config['bookname'] %>" linear="<%= @cover_linear %>"/>
+<% if @config['mytoc'] %>
+    <itemref idref="toc" />
+<% end %>
+<% @ncx_contents.each do |item| %>
+    <itemref idref="<%= item.id %>"/>
+<% end %>
+  </spine>

data/templates/opf/opf_tocx_epubv3.opf.erb

@@ -0,0 +1,17 @@
+<% if @config['direction'] %>
+  <spine page-progression-direction="<%= @config['direction'] %>">
+<% else %>
+  <spine>
+<% end %>
+    <itemref idref="<%= @config['bookname'] %>" linear="<%= @cover_linear %>"/>
+<% toc = nil %>
+<% @tocx_contents.each do |item| %>
+<%   if toc.nil? && item.chaptype != 'pre' %>
+<%     if @config['toc'] %>
+    <itemref idref="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" />
+<%     end %>
+<%     toc = true %>
+<%   end %>
+    <itemref idref="<%= item.id %>"/>
+<% end %>
+  </spine>

data/templates/web/html/layout-html5.html.erb

@@ -3,15 +3,21 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="<%=h @language %>">
 <head>
   <meta charset="UTF-8" />
+<% if @javascripts.present? %>
+<%   @javascripts.each do |js| %>
+  <%= js %>
+
+<%   end %>
+<% end %>
 <% if @stylesheets.present? %>
 <%   @stylesheets.each do |style| %>
   <link rel="stylesheet" type="text/css" href="<%=h style %>" />
 <%   end %>
 <% end%>
-<% if @next.present? %><link rel="next" title="<%= h(@next_title)%>" href="<%= h(@next.id.to_s+"."+@book.config['htmlext']) %>"><% end %>
-<% if @prev.present? %><link rel="prev" title="<%= h(@prev_title)%>" href="<%= h(@prev.id.to_s+"."+@book.config['htmlext']) %>"><% end %>
+<% if @next.present? %><link rel="next" title="<%= h(@next_title)%>" href="<%= h(@next.id.to_s+"."+@book.config['htmlext']) %>" /><% end %>
+<% if @prev.present? %><link rel="prev" title="<%= h(@prev_title)%>" href="<%= h(@prev.id.to_s+"."+@book.config['htmlext']) %>" /><% end %>
   <meta name="generator" content="Re:VIEW" />
-  <title><%=h @title %> | <%=h @book.config.name_of("booktitle")%></title>
+  <title><%= @title %> | <%=h @book.config.name_of("booktitle")%></title>
 </head>
 <body<%= @body_ext %>>
   <div class="book">
@@ -47,10 +53,5 @@
     <p class="copyright"><%=h @config["copyright"] %></p>
     <% end %>
   </footer>
-  <% if @javascripts.present? %>
-  <%   @javascripts.each do |script| %>
-  <script src="<%=h script %>"></script>
-  <%   end %>
-  <% end%>
 </body>
 </html>

data/templates/web/html/layout-xhtml1.html.erb

@@ -3,6 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="<%= @language %>">
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+<% if @javascripts.present? %>
+<%   @javascripts.each do |js| %>
+  <%= js %>
+
+<%   end %>
+<% end %>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
 <% if @stylesheets.present? %>
 <%   @stylesheets.each do |style| %>

data/test/assets/header_listener.html

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="ja">
+<head>
+  <meta charset="UTF-8" />
+  <link rel="stylesheet" type="text/css" href="style.css" />
+  <meta name="generator" content="Re:VIEW" />
+  <title>first chapter</title>
+</head>
+<body>
+<h1><a id="h1"></a><span class="secno">第1章　</span>first chapter</h1>
+
+<h2><a id="h1-1"></a><span class="secno">1.1　</span>first section</h2>
+
+<h3><a id="h1-1-1"></a>first <img src="images/icon1.jpg" alt="subsection" /></h3>
+
+<h2><a id="h1-2"></a><span class="secno">1.2　</span>second section</h2>
+
+<h3 id="dummy1"><a id="h1-2-1"></a>dummy subsection</h3>
+
+<h2><a id="h1-3"></a><span class="secno">1.3　</span>third section</h2>
+
+<h2 id="ch01_nonum1" notoc="true">notoc section</h2>
+
+<h2 id="dummy2" notoc="true">notoc section</h2>
+
+<a id="ch01_nonum3" /><h2 id="ch01_nonum3" hidden="true">nodisp section</h2>
+
+<a id="dummy3" /><h2 id="dummy3" hidden="true">nodisp section</h2>
+
+<h2 id="ch01_nonum5">nonum section</h2>
+
+<h2 id="dummy4">nonum section</h2>
+</body>
+</html>

data/test/assets/syntax_book_index_detail.txt

@@ -0,0 +1,58 @@
+=============================
+   272C    16L     1P  pre01
+-----------------------------
+   272C    16L   0.7P  前書き
+=============================
+     9C     1L     1P  
+-----------------------------
+     9C     1L   0.0P  第I部　部扉見出し
+=============================
+  2444C    75L     5P  ch01
+-----------------------------
+   419C     9L   0.6P  第1章　章見出し
+   270C     9L   0.5P    1.1　節見出し
+   137C     3L   0.2P      1.1.1　項見出し……に脚注を入れるとTeXではエラー
+   187C     5L   0.3P        1.1.1.1　段見出し
+    46C     1L   0.0P    1.2　長い節見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+    48C     1L   0.0P      1.2.1　長い項見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+   193C     4L   0.3P        1.2.1.1　長い段見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+   138C     2L   0.2P      1.2.2　採番する項見出し
+     8C     1L   0.0P    1.3　箇条書き
+   255C    12L   0.6P      1.3.1　ナカグロ箇条書き
+   159C     7L   0.4P      1.3.2　番号箇条書き
+   584C    21L   1.0P      1.3.3　用語リスト
+=============================
+   169C     2L     1P  part2
+-----------------------------
+   169C     2L   0.2P  第II部　部見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+=============================
+  5652C   175L    10P  ch02
+-----------------------------
+    52C     1L   0.0P  第2章　長い章見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
+    10C     1L   0.0P    2.1　ブロック命令
+   784C    27L   1.4P      2.1.1　ソースコード
+   338C     8L   0.5P      2.1.2　図
+   709C    22L   1.3P      2.1.3　表
+  1154C    56L   2.8P      2.1.4　囲み記事
+   523C    14L   0.8P    2.2　LaTeX式
+    11C     1L   0.0P    2.3　インライン命令
+   967C    17L   1.3P      2.3.1　書体
+    74C     1L   0.0P      2.3.2　見出し内 BOLD,ITALIC,TT,STRONG,EM,CODE,TTB,TTI,AMI,BOU,KW,UNDERLINE,INS、
+   797C    22L   1.3P      2.3.3　参照
+    39C     2L   0.1P      2.3.4　参考文献
+   194C     3L   0.3P      2.3.5　索引
+=============================
+  2255C    38L     4P  ch03
+-----------------------------
+  2255C    38L   3.1P  第3章　コラム
+=============================
+   134C    12L     1P  appA
+-----------------------------
+    10C     1L   0.0P  付録A　付録の見出し
+     8C     1L   0.0P    A.1　付録の節
+    10C     1L   0.0P      A.1.1　付録の項
+   106C     9L   0.4P        A.1.1.1　付録の段
+=============================
+   219C     3L     1P  bib
+-----------------------------
+   219C     3L   0.2P  参考文献

data/test/assets/test_template.tex

@@ -1,6 +1,6 @@
 \documentclass[dvipdfmx]{review-jsbook}
 \makeatletter
-\def\review@reviewversion{3.2.0}
+\def\review@reviewversion{5.1.0}
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{review-jsbook}
 
@@ -9,7 +9,7 @@
 \def\review@autnames{anonymous}
 
 \def\review@titlepageauthors{anonymous　著}
-\def\review@date{2011{-}01{-}01}
+\def\review@date{2020{-}07{-}11}
 
 \def\review@bookname{sample}
 \def\review@language{ja}
@@ -38,7 +38,7 @@
 \def\review@usecovernombre{true}
 \def\review@titlepage{true}
 
-\def\review@pubhistories{2011年1月1日　発行}
+\def\review@pubhistories{2020年7月11日　発行}
 \def\review@colophonnames{著　者 & anonymous \\
 }
 
@@ -58,6 +58,9 @@
   \ifdefined\covermatter\else% for 4.0.0 compatibility
     \def\covermatter{}
   \fi
+  \ifdefined\reviewchapref\else% for 5.1.0 compatibility
+    \newcommand{\reviewchapref}[2]{\hyperref[##2]{##1}}
+  \fi
 }
 
 \makeatother

data/test/assets/test_template_backmatter.tex

@@ -1,6 +1,6 @@
 \documentclass[dvipdfmx]{review-jsbook}
 \makeatletter
-\def\review@reviewversion{3.2.0}
+\def\review@reviewversion{5.1.0}
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{review-jsbook}
 
@@ -9,7 +9,7 @@
 \def\review@autnames{anonymous}
 
 \def\review@titlepageauthors{anonymous　著}
-\def\review@date{2011{-}01{-}01}
+\def\review@date{2020{-}07{-}11}
 
 \def\review@bookname{sample}
 \def\review@language{ja}
@@ -49,7 +49,7 @@ some ad content
 }
 \null}
 
-\def\review@pubhistories{2011年1月1日　発行}
+\def\review@pubhistories{2020年7月11日　発行}
 \def\review@colophonnames{著　者 & anonymous \\
 }
 
@@ -69,6 +69,9 @@ some ad content
   \ifdefined\covermatter\else% for 4.0.0 compatibility
     \def\covermatter{}
   \fi
+  \ifdefined\reviewchapref\else% for 5.1.0 compatibility
+    \newcommand{\reviewchapref}[2]{\hyperref[##2]{##1}}
+  \fi
 }
 
 \makeatother

data/test/book_test_helper.rb

@@ -13,13 +13,19 @@ module BookTestHelper
     Dir.mktmpdir do |tmpdir|
       Dir.chdir(tmpdir) do
         dir = '.'
-        files.each_pair do |basename, content|
-          path = File.join(dir, basename)
+        files.each_pair do |filename, content|
+          path = File.join(dir, filename)
+          FileUtils.mkdir_p(File.dirname(path))
           File.open(path, 'w') { |o| o.print content }
-          created_files[basename] = path
+          created_files[filename] = path
         end
-        book = Book::Base.load(dir)
-        book.config = ReVIEW::Configure.values
+        conf_path = File.expand_path('config.yml', dir)
+        if File.exist?(conf_path)
+          config = ReVIEW::Configure.create(yamlfile: conf_path)
+        else
+          config = ReVIEW::Configure.values
+        end
+        book = Book::Base.new(dir, config: config)
         yield(dir, book, created_files)
       end
     end

data/test/run_test.rb

@@ -1,4 +1,4 @@
-base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+base_dir = File.expand_path('..', __dir__)
 lib_dir  = File.join(base_dir, 'lib')
 test_dir = File.join(base_dir, 'test')