review 3.0.0.preview1 → 3.0.0.preview2

data/{test → samples}/syntax-book/config.yml

@@ -22,7 +22,7 @@ epubmaker:
   htmlext: xhtml
 
 texstyle: reviewmacro
-# texdocumentclass: ["jsbook", "uplatex,oneside"]
+# texdocumentclass: ["jsbook", "uplatex,twoside"]
 # texcommand: "uplatex"
 # texoptions: null
 # dvicommand: "dvipdfmx"

data/{test/sample-book/src → samples/syntax-book}/style.css

@@ -66,7 +66,7 @@ p {
     line-height: 1.6;
 }
 div.lead p {
-	color: #666;
+    color: #666;
     line-height: 1.6;
     font-size: 0.75em;
 }

data/templates/latex/review-jlreq/review-style.sty

@@ -81,10 +81,10 @@
 \newcommand{\reviewcmdcaption}[1]{\review@commoncaption{}{#1}}
 \newenvironment{reviewlistblock}{\list{}{\topsep.5\baselineskip \leftmargin\z@ \itemindent\z@}\item\relax}{\endlist}% 上下アキ0.5
 
-\newenvironment{reviewimage}[1][H]{%
+\newenvironment{reviewimage}[1]{%
   \begin{figure}[#1]\begin{center}}{\end{center}\end{figure}}
 
-\newenvironment{reviewdummyimage}[1][ht]{%
+\newenvironment{reviewdummyimage}[1]{%
   \begin{reviewimage}[#1]}{\end{reviewimage}}
 
 \newcommand{\reviewindepimagecaption[2]}{\@makecaption{}{#2}}
@@ -147,3 +147,7 @@
 % ヘッダスタイル
 \ModifyPageStyle{headings}{nombre_position={top-fore_edge},running_head_position={top-fore_edge}}
 \pagestyle{headings}
+
+% 図表フロートの配置
+\floatplacement{figure}{H}
+\floatplacement{table}{htp}

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

@@ -36,11 +36,6 @@
   \MakeFramed {\FrameRestore}}%
  {\endMakeFramed}
 
-\ifthenelse{\equal{\review@documentclass}{utbook} \OR \equal{\review@documentclass}{tbook}}{%
-}{%
-\RequirePackage[top=10zw,bottom=12zw,left=10zw,right=10zw]{geometry}%
-}
-
 \newcommand{\parasep}{\vspace*{3zh}}
 \setlength{\footskip}{30pt}
 
@@ -93,13 +88,13 @@
 \fi
 
 \newenvironment{reviewimage}{%
-  \begin{figure}[H]
+  \begin{figure}
     \begin{center}}{%
     \end{center}
   \end{figure}}
 
 \newenvironment{reviewdummyimage}{%
-  \begin{figure}[H]
+  \begin{figure}
     \begin{center}\begin{alltt}}{%
     \end{alltt}\end{center}
   \end{figure}}

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

@@ -1,8 +1,13 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{review-style}[2018/07/01]
+
 \RequirePackage{fancyhdr}
 \pagestyle{fancy}
 \lhead{\gtfamily\sffamily\bfseries\upshape \leftmark}
 \chead{}
 \rhead{\gtfamily\sffamily\bfseries\upshape \rightmark}
+\fancyfoot{} % clear all header and footer fields
+\fancyfoot[LE,RO]{\thepage}
 \renewcommand{\sectionmark}[1]{\markright{\thesection~#1}{}}
 \renewcommand{\chaptermark}[1]{\markboth{\prechaptername\ \thechapter\ \postchaptername~#1}{}}
 \renewcommand{\headfont}{\gtfamily\sffamily\bfseries}
@@ -10,7 +15,7 @@
 \fancypagestyle{plainhead}{%
 \fancyhead{}
 \fancyfoot{} % clear all header and footer fields
-\fancyfoot[CE,CO]{\thepage}
+\fancyfoot[LE,RO]{\thepage}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}}
 
@@ -36,3 +41,6 @@
 
 %% disable hyperlink color and border
 \hypersetup{hidelinks}
+
+\floatplacement{figure}{H}
+\floatplacement{table}{htp}

data/test/assets/test_template.tex

@@ -1,4 +1,4 @@
-\documentclass[dvipdfmx,uplatex,oneside]{jsbook}
+\documentclass[dvipdfmx,uplatex,twoside]{jsbook}
 \makeatletter
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{jsbook}

data/test/assets/test_template_backmatter.tex

@@ -1,4 +1,4 @@
-\documentclass[dvipdfmx,uplatex,oneside]{jsbook}
+\documentclass[dvipdfmx,uplatex,twoside]{jsbook}
 \makeatletter
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{jsbook}

data/test/test_compiler.rb

@@ -45,9 +45,7 @@ class CompilerTest < Test::Unit::TestCase
     source_str = <<-'EOB'
 @<m>${}\}|$, @<m>|{}\}\$|, @<m>|\{\a\}|, @<tt>|}|, @<tt>|\|, @<tt>|\\|, @<tt>|\\\|
     EOB
-    expected = <<-'EOB'
-@<m>{{\}\\\}|}, @<m>{{\}\\\}\$}, @<m>{\{\a\\\}}, @<tt>{\}}, @<tt>{\\}, @<tt>{\\\\}, @<tt>{\\\\\\}
-    EOB
+    expected = "@<m>{\x03\x04\x02\x04|}, @<m>{\x03\x04\x02\x04\x02$}, @<m>{\x02\x03\x02a\x02\x04}, @<tt>{\x04}, @<tt>{\x02}, @<tt>{\x02\x02}, @<tt>{\x02\x02\x02}\n"
     actual = @c.__send__(:replace_fence, source_str)
     assert_equal expected, actual
   end

data/test/test_helper.rb

@@ -11,7 +11,7 @@ def assets_dir
 end
 
 def prepare_samplebook(srcdir)
-  samplebook_dir = File.expand_path('sample-book/src/', File.dirname(__FILE__))
+  samplebook_dir = File.expand_path('../samples/sample-book/src/', File.dirname(__FILE__))
   FileUtils.cp_r(Dir.glob(samplebook_dir + '/*'), srcdir)
   YAML.load(File.open(srcdir + '/config.yml'))
 end

data/test/test_latexbuilder.rb

@@ -593,7 +593,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_emtable
     actual = compile_block("//emtable[foo]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n//emtable{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
-    assert_equal "\\begin{table}[h]%%\n\\reviewtablecaption*{foo}\n\\begin{reviewtable}{|l|l|}\n\\hline\n\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline\nccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline\n\\end{reviewtable}\n\\end{table}\n\n\\begin{reviewtable}{|l|l|}\n\\hline\n\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline\nccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline\n\\end{reviewtable}\n",
+    assert_equal "\\begin{table}%%\n\\reviewtablecaption*{foo}\n\\begin{reviewtable}{|l|l|}\n\\hline\n\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline\nccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline\n\\end{reviewtable}\n\\end{table}\n\n\\begin{reviewtable}{|l|l|}\n\\hline\n\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline\nccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline\n\\end{reviewtable}\n",
                  actual
   end
 
@@ -992,6 +992,8 @@ EOS
   def test_inline_fence
     actual = compile_inline('test @<code>|@<code>{$サンプル$}|')
     assert_equal 'test \\reviewcode{@\\textless{}code\\textgreater{}\\{\\textdollar{}サンプル\\textdollar{}\\}}', actual
+    actual2 = compile_inline('test @<code>|@<code>{$サンプル$}|, @<m>$\begin{array}{ll}a & b\\\alpha & @\\\end{array}$')
+    assert_equal 'test \\reviewcode{@\\textless{}code\\textgreater{}\\{\\textdollar{}サンプル\\textdollar{}\\}}, $\begin{array}{ll}a & b\\\alpha & @\\\end{array}$', actual2
   end
 
   def test_inline_w
@@ -1074,7 +1076,7 @@ EOS
 
 \\reviewtableref{A.1}{table:chap1:foo}
 
-\\begin{table}[h]%%foo
+\\begin{table}%%foo
 \\reviewtablecaption{FOO}
 \\label{table:chap1:foo}
 \\begin{reviewtable}{|l|l|}

data/test/test_plaintextbuilder.rb

@@ -382,7 +382,7 @@ test
 inside column
 
 next level
-this is test.
+this is コラム「test」.
 EOS
 
     assert_equal expected, column_helper(review)

data/test/test_rstbuilder.rb

@@ -347,7 +347,7 @@ EOS
 next level
 --------------------
 
-this is test.
+this is コラム「test」.
 
 EOS
 

data/test/test_topbuilder.rb

@@ -135,6 +135,11 @@ class TOPBuidlerTest < Test::Unit::TestCase
     assert_equal 'test ◆→コメント←◆ test2', actual
   end
 
+  def test_inline_fence
+    actual = compile_inline('@<m>|a|, @<m>{\\frac{1\\}{2\\}}, @<m>$\\frac{1}{2}$, @<m>{\\{ \\\\\\}}, @<m>|\\{ \\}|, test @<code>|@<code>{$サンプル$}|')
+    assert_equal '◆→TeX式ここから←◆a◆→TeX式ここまで←◆, ◆→TeX式ここから←◆\\frac{1}{2}◆→TeX式ここまで←◆, ◆→TeX式ここから←◆\\frac{1}{2}◆→TeX式ここまで←◆, ◆→TeX式ここから←◆\\{ \\}◆→TeX式ここまで←◆, ◆→TeX式ここから←◆\\{ \\}◆→TeX式ここまで←◆, test △@<code>{$サンプル$}☆', actual
+  end
+
   def test_inline_in_table
     actual = compile_block("//table{\n★1☆\t▲2☆\n------------\n★3☆\t▲4☆<>&\n//}\n")
     assert_equal %Q(◆→開始:表←◆\n★★1☆☆\t★▲2☆☆\n★3☆\t▲4☆<>&\n◆→終了:表←◆\n\n), actual
@@ -401,7 +406,7 @@ inside column
 ◆→終了:コラム←◆
 
 ■H3■next level
-this is test.
+this is コラム「test」.
 EOS
 
     assert_equal expected, column_helper(review)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 3.0.0.preview1
+  version: 3.0.0.preview2
 platform: ruby
 authors:
 - kmuto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_size
@@ -132,6 +132,7 @@ executables:
 - review-check
 - review-checkdep
 - review-compile
+- review-epub2html
 - review-epubmaker
 - review-index
 - review-init
@@ -161,6 +162,7 @@ files:
 - bin/review-check
 - bin/review-checkdep
 - bin/review-compile
+- bin/review-epub2html
 - bin/review-epubmaker
 - bin/review-index
 - bin/review-init
@@ -229,6 +231,7 @@ files:
 - lib/review/compiler.rb
 - lib/review/configure.rb
 - lib/review/converter.rb
+- lib/review/epub2html.rb
 - lib/review/epubbuilder.rb
 - lib/review/epubmaker.rb
 - lib/review/epubmaker/reviewheaderlistener.rb
@@ -269,6 +272,47 @@ files:
 - lib/review/webtocprinter.rb
 - lib/review/yamlloader.rb
 - review.gemspec
+- samples/LICENSE
+- samples/sample-book/README.md
+- samples/sample-book/src/Rakefile
+- samples/sample-book/src/_cover.html
+- samples/sample-book/src/catalog.yml
+- samples/sample-book/src/ch01.re
+- samples/sample-book/src/ch02.re
+- samples/sample-book/src/config-epub2.yml
+- samples/sample-book/src/config.yml
+- samples/sample-book/src/images/ch01-imgsample.jpg
+- samples/sample-book/src/images/cover.jpg
+- samples/sample-book/src/preface.re
+- samples/sample-book/src/sty/jumoline.sty
+- samples/sample-book/src/sty/reviewmacro.sty
+- samples/sample-book/src/style-web.css
+- samples/sample-book/src/style.css
+- samples/syntax-book/Gemfile
+- samples/syntax-book/Rakefile
+- samples/syntax-book/appA.re
+- samples/syntax-book/bib.re
+- samples/syntax-book/catalog.yml
+- samples/syntax-book/ch01.re
+- samples/syntax-book/ch02.re
+- samples/syntax-book/ch03.re
+- samples/syntax-book/config.yml
+- samples/syntax-book/images/ball.png
+- samples/syntax-book/images/cover.jpg
+- samples/syntax-book/images/fractal.png
+- samples/syntax-book/images/img3-1.png
+- samples/syntax-book/images/inlineicon.jpg
+- samples/syntax-book/images/logic.png
+- samples/syntax-book/images/logic2.png
+- samples/syntax-book/images/puzzle.jpg
+- samples/syntax-book/images/table.jpg
+- samples/syntax-book/part2.re
+- samples/syntax-book/pre01.re
+- samples/syntax-book/review-ext.rb
+- samples/syntax-book/sty/jumoline.sty
+- samples/syntax-book/sty/reviewmacro.sty
+- samples/syntax-book/style.css
+- samples/syntax-book/syntax.dic
 - templates/LICENSE
 - templates/README.md
 - templates/html/layout-html5.html.erb
@@ -305,46 +349,6 @@ files:
 - test/assets/test_template_backmatter.tex
 - test/book_test_helper.rb
 - test/run_test.rb
-- test/sample-book/README.md
-- test/sample-book/src/Rakefile
-- test/sample-book/src/_cover.html
-- test/sample-book/src/catalog.yml
-- test/sample-book/src/ch01.re
-- test/sample-book/src/ch02.re
-- test/sample-book/src/config-epub2.yml
-- test/sample-book/src/config.yml
-- test/sample-book/src/images/ch01-imgsample.jpg
-- test/sample-book/src/images/cover.jpg
-- test/sample-book/src/preface.re
-- test/sample-book/src/sty/jumoline.sty
-- test/sample-book/src/sty/reviewmacro.sty
-- test/sample-book/src/style-web.css
-- test/sample-book/src/style.css
-- test/syntax-book/Gemfile
-- test/syntax-book/Rakefile
-- test/syntax-book/appA.re
-- test/syntax-book/bib.re
-- test/syntax-book/catalog.yml
-- test/syntax-book/ch01.re
-- test/syntax-book/ch02.re
-- test/syntax-book/ch03.re
-- test/syntax-book/config.yml
-- test/syntax-book/images/ball.png
-- test/syntax-book/images/cover.jpg
-- test/syntax-book/images/fractal.png
-- test/syntax-book/images/img3-1.png
-- test/syntax-book/images/inlineicon.jpg
-- test/syntax-book/images/logic.png
-- test/syntax-book/images/logic2.png
-- test/syntax-book/images/puzzle.jpg
-- test/syntax-book/images/table.jpg
-- test/syntax-book/part2.re
-- test/syntax-book/pre01.re
-- test/syntax-book/review-ext.rb
-- test/syntax-book/sty/jumoline.sty
-- test/syntax-book/sty/reviewmacro.sty
-- test/syntax-book/style.css
-- test/syntax-book/syntax.dic
 - test/test_book.rb
 - test/test_book_chapter.rb
 - test/test_book_part.rb
@@ -433,46 +437,6 @@ test_files:
 - test/assets/test_template_backmatter.tex
 - test/book_test_helper.rb
 - test/run_test.rb
-- test/sample-book/README.md
-- test/sample-book/src/Rakefile
-- test/sample-book/src/_cover.html
-- test/sample-book/src/catalog.yml
-- test/sample-book/src/ch01.re
-- test/sample-book/src/ch02.re
-- test/sample-book/src/config-epub2.yml
-- test/sample-book/src/config.yml
-- test/sample-book/src/images/ch01-imgsample.jpg
-- test/sample-book/src/images/cover.jpg
-- test/sample-book/src/preface.re
-- test/sample-book/src/sty/jumoline.sty
-- test/sample-book/src/sty/reviewmacro.sty
-- test/sample-book/src/style-web.css
-- test/sample-book/src/style.css
-- test/syntax-book/Gemfile
-- test/syntax-book/Rakefile
-- test/syntax-book/appA.re
-- test/syntax-book/bib.re
-- test/syntax-book/catalog.yml
-- test/syntax-book/ch01.re
-- test/syntax-book/ch02.re
-- test/syntax-book/ch03.re
-- test/syntax-book/config.yml
-- test/syntax-book/images/ball.png
-- test/syntax-book/images/cover.jpg
-- test/syntax-book/images/fractal.png
-- test/syntax-book/images/img3-1.png
-- test/syntax-book/images/inlineicon.jpg
-- test/syntax-book/images/logic.png
-- test/syntax-book/images/logic2.png
-- test/syntax-book/images/puzzle.jpg
-- test/syntax-book/images/table.jpg
-- test/syntax-book/part2.re
-- test/syntax-book/pre01.re
-- test/syntax-book/review-ext.rb
-- test/syntax-book/sty/jumoline.sty
-- test/syntax-book/sty/reviewmacro.sty
-- test/syntax-book/style.css
-- test/syntax-book/syntax.dic
 - test/test_book.rb
 - test/test_book_chapter.rb
 - test/test_book_part.rb