review 2.5.0 → 3.0.0.preview1

data/vendor/plistings/test1.tex

@@ -0,0 +1,174 @@
+%#!ptex2pdf -l -e -u test1.tex
+\ifdefined\directlua
+  \documentclass{ltjarticle}
+  \usepackage{listings,xcolor}
+\else
+  \documentclass[dvipdfmx]{ujarticle}
+  \usepackage{plistings,xcolor}
+  \def\zw{zw}
+\fi
+\usepackage{amsmath,showexpl,comment}
+\usepackage
+[
+	papersize={100mm,100mm},
+	hmargin={5mm,5mm},
+	vmargin={5mm,5mm}
+]{geometry}
+\pagestyle{empty}
+
+\lstset
+{
+	language=sh, extendedchars=false,
+	backgroundcolor=\color[gray]{.75},
+	breaklines=true,
+        explpreset={columns=fixed},
+        basewidth={0.5\zw, 0.45em},
+	numbers=left,numberstyle=\tiny, numbersep=2pt,
+}
+
+\lstnewenvironment{env}[1]
+{
+	\ifx\relax#1\else
+	\renewcommand{\lstlistingname}{ex}
+	\lstset
+	{
+		caption=#1,
+	}
+	\fi
+}{}
+\def\rmdefault{qpl}
+\def\ttdefault{qcr}
+\def\cs#1{\hbox{\texttt{\textbackslash #1}}}
+\begin{document}
+
+This test file is based on a.tex\footnote{This can be downloaded from {\tt https://gist.github.com/1574793}.} by x19290.
+
+
+\textbf{SOLVED}: bad folding and not slanted problems are common in pLaTeX and LuaTeX-ja.
+
+The cause of the latter problem is that Japanese fonts don't have italic shape by default.
+In this document, we define them by
+\begin{lstlisting}[language={[AlLaTeX]TeX}, basicstyle=\ttfamily]
+\DeclareFontShape{JY3}{mc}{m}{sl}{<-> s * [0.92489] psft:Ryumin-Light:jfm=ujis;slant=0.167}{}
+\DeclareFontShape{JY3}{mc}{m}{it}{<-> ssub* mc/m/sl}{}
+\end{lstlisting}
+
+\newpage
+
+We also avoid white band problem, by setting the value of \cs{lineskiplimit} to
+\begin{multline}
+ -\min(\cs{cht}-\cs{ht}\cs{strutbox}, 0)\\
+ -\min(\cs{cdp}-\cs{dp}\cs{strutbox}, 0).
+\end{multline}
+
+Note: we still have a white band if the first line is line-broken.
+
+\begin{env}{\relax}aa
+#!/bin/sh
+#長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い
+#超長い長い長い長い長い長い長い長い長い長い長い長い長い，長い長い長い長い長い長い
+#長い長い長い長い長い長い長い長い長い長い長い長い，長い長い長い長い長い長い
+#I.長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い長いI
+長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い
+#IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII
+IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII IIII
+\end{env}
+
+\newpage
+
+\textbf{SOLVED}: LuaTeX-ja specific problem:
+when the \emph{begin} line of a listings environment ends with JAchar,
+the first line of the listing is not rendered.
+
+\begin{env}{problem; shebang not rendered --- 問題}
+#!/bin/bash
+:
+\end{env}
+
+\begin{LTXexample}[language=TeX]
+え!1あ，い・あ）う（え
+え!2あ
+\end{LTXexample}
+
+\begin{lstlisting}
+え!1あｱｲｳｴｵ
+え!2あ
+\end{lstlisting}
+\newpage
+\textbf{Ticket \#29311}
+
+\begin{env}{\relax}
+長い長い長い長い長い長い長い長い長い長い長い長aaa長い::い長い
+長い長い長い長い長い長い長い長い長い長い長い長aaaa長い::い長い
+長い長い長い長い長い長い長い長い長い長い長い長い長い，長い長い
+あ長い長い長い長い長い長い長い長い長い長い長い長い長い，長い長い
+長い長い長い長い長い長い長い長い長い長い長い長い長a，::い長い
+長い長い長い長い長い長い長い長い長い長い長い長い長aa，::い長い
+長い長い長い長い長い長い長い長い長い長い長い長い長aaa，::い長い
+長い長い長い長い長い長い長い長い長い長い長い長い長aaaa，::い長い
+長い長い長い長い長い長い長い長い長い長い長い長い長い，，::い長い
+長い長い長い長い長い長い長い長い長い長い長い長（い長い
+長い長い長い長い長い長い長い長い長い長い長いaa（い長い
+長い長い長い長い長い長い長い長い長い長い長い長（aa長い
+長い長い長い長い長い長い長い長い長い長い長い長い）（長い
+あ長い長い長い長い長い長い長い長い長い長い長い長い）（長い
+\end{env}
+
+下の行において，最初の「1」の場所がずれてしまうのは半ば仕方がないとも言える．
+1行目では，「1234567890」が前後・文字間に計11箇所の等量の空白を入れて10全角の領域に
+出力されているのに対し，2,~3行目では「1」が全角幅に左右中央で出力されているからである．
+\begin{lstlisting}[basewidth=1em, basicstyle=\tt]
+1234567890
+1あ，23
+1あ2，3
+1234567890
+\end{lstlisting}
+
+\texttt{doubleletterspace}オプションを指定すると，出力単位中の文字と文字の間隔を2倍にするため，
+下の例の「1」のように，各文字の垂直位置が揃いやすくなる．
+\begin{lstlisting}[doubleletterspace, basewidth=1em, basicstyle=\tt]
+1234567890
+1あ，23
+1あ2，3
+1）2，3
+1234567890
+\end{lstlisting}
+
+
+\newpage
+\textbf{Ticket \#34786}
+
+foo \lstinline[basicstyle=\tt]!b  a{}#shr! baz あ
+
+foo \lstinline[basicstyle=\tt]!bxxa{}#shr! baz あ
+
+あ\lstinline[basicstyle=\tt]{bar  s}hoge
+
+あ\lstinline[basicstyle=\tt]{bar..{a}hoge
+
+foo \lstinline[basicstyle=\tt\gtfamily]!あexit 0; #shbar! baz あ
+
+あ\lstinline[basicstyle=\tt]{いbexit #sh$ar}hoge
+
+\bigskip
+\textbf{Ticket \#35484}
+
+\colorbox{red}{\lstinline!aiu#sheoxyz!}
+\colorbox{red}{\lstinline!あいexit 0;#shうえお!}
+
+
+\colorbox{red}{\lstinline{aiu#sheoxyz}}
+\colorbox{red}{\lstinline{あいexit 0;#shうえお}}
+
+\bigskip
+\textbf{escape to \LaTeX}
+
+あおいうえお
+%\tracingall
+\begin{lstlisting}[commentstyle=\color{green}\bfseries,
+  frame=single,language=TeX, escapechar=!]
+ABCXYZあい!\color{blue}あ$a_{ijk}\times\hbox{ほげ}$いうえ!うえ% あいうえおAIg
+あいうえお!\西暦\today\和暦\today!abcdef
+\end{lstlisting}
+あいうえお
+\end{document}

data/vendor/plistings/test2.tex

@@ -0,0 +1,54 @@
+%#!ptex2pdf -l -e test2.tex
+\ifdefined\directlua
+  \documentclass{ltjsarticle}
+  \usepackage{listings,xcolor}
+\else
+  \documentclass[uplatex,dvipdfmx]{jsarticle}
+  \usepackage{plistings,xcolor}
+  \def\zw{zw}
+\fi
+\usepackage{lmodern}
+\usepackage{showexpl}
+\lstset{
+  language=C, frame=trbl, framesep=5pt,
+  commentstyle=\color{green!50!black},
+  basicstyle=\ttfamily, basewidth=0.5em,
+  keywordstyle=\bfseries\color{blue},
+}
+\begin{document}
+\begin{lstlisting}
+#define N 6
+#define ARSZ 2*N
+#define ARY unsigned int
+/* 1 次元配列 ARY data[ARSZ] をテーブルだと思う */
+/* ARY は 32bit 符号なし整数と仮定．すると各行 1変数で済む */
+
+/* 読みだし */
+inline ARY read(const ARY data[], const int row, const int col) {
+  return data[row] & ((ARY)1)<<col;
+}
+/* 書き込み */
+inline void mark(ARY data[], const int row, const int col) {
+  data[row] |= ((ARY)1)<<col;
+}
+
+unsigned long long counter;
+/* 「次に探索」 */
+int next_pos_x, next_pos_y;
+/* pos_history[i][k] は，i 番の短冊の (k-1) 番目の cellの位置を
+   pack(row, col) = (row << 8) + col という 16ビット整数として管理する．*/
+int pos_history[(N*N)<<2];
+#define pack(x,y) ((x)<<8)+(y) 
+\end{lstlisting}
+
+\lstinputlisting[language={[LaTeX]TeX}]{\jobname.tex}
+
+{\catcode`\^^@=12 \global\let\NUL=^^@
+\begin{LTXexample}
+ \西暦\today，\和暦\today
+ \par{\ttfamily\meaning\西暦}
+ a\NUL a^^@a
+\end{LTXexample}}
+なお，\lstinline|^^@|~(\lstinline|\0|) を陽にソース中に書いた場合は
+エラーが発生する．
+\end{document}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0.preview1
 platform: ruby
 authors:
 - kmuto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_size
@@ -87,14 +87,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.57.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.57.2
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +231,7 @@ files:
 - lib/review/converter.rb
 - lib/review/epubbuilder.rb
 - lib/review/epubmaker.rb
+- lib/review/epubmaker/reviewheaderlistener.rb
 - lib/review/exception.rb
 - lib/review/extentions.rb
 - lib/review/extentions/hash.rb
@@ -228,6 +243,7 @@ files:
 - lib/review/i18n.rb
 - lib/review/i18n.yml
 - lib/review/idgxmlbuilder.rb
+- lib/review/init.rb
 - lib/review/latexbuilder.rb
 - lib/review/latexindex.rb
 - lib/review/latexutils.rb
@@ -248,7 +264,6 @@ files:
 - lib/review/tocparser.rb
 - lib/review/tocprinter.rb
 - lib/review/topbuilder.rb
-- lib/review/unfold.rb
 - lib/review/version.rb
 - lib/review/webmaker.rb
 - lib/review/webtocprinter.rb
@@ -258,14 +273,27 @@ files:
 - templates/README.md
 - templates/html/layout-html5.html.erb
 - templates/html/layout-xhtml1.html.erb
+- templates/latex-compat2/layout.tex.erb
+- templates/latex/config.erb
 - templates/latex/layout.tex.erb
+- templates/latex/review-jlreq/README.md
+- templates/latex/review-jlreq/review-base.sty
+- templates/latex/review-jlreq/review-custom.sty
+- templates/latex/review-jlreq/review-jlreq.cls
+- templates/latex/review-jlreq/review-style.sty
+- templates/latex/review-jlreq/reviewmacro.sty
+- templates/latex/review-jsbook/jumoline.sty
+- templates/latex/review-jsbook/plistings.sty
+- templates/latex/review-jsbook/review-base.sty
+- templates/latex/review-jsbook/review-custom.sty
+- templates/latex/review-jsbook/review-style.sty
+- templates/latex/review-jsbook/reviewmacro.sty
 - templates/ncx/epubv2.ncx.erb
 - templates/opf/epubv2.opf.erb
 - templates/opf/epubv3.opf.erb
 - templates/web/html/layout-html5.html.erb
 - templates/web/html/layout-xhtml1.html.erb
 - templates/xml/container.xml.erb
-- test/CHAPS
 - test/assets/black.eps
 - test/assets/fit.png
 - test/assets/large.gif
@@ -275,7 +303,6 @@ files:
 - test/assets/test.xml.erb
 - test/assets/test_template.tex
 - test/assets/test_template_backmatter.tex
-- test/bib.re
 - test/book_test_helper.rb
 - test/run_test.rb
 - test/sample-book/README.md
@@ -293,10 +320,6 @@ files:
 - test/sample-book/src/sty/reviewmacro.sty
 - test/sample-book/src/style-web.css
 - test/sample-book/src/style.css
-- test/sample-book/src/vendor/jumoline/README
-- test/sample-book/src/vendor/jumoline/jumoline.dtx
-- test/sample-book/src/vendor/jumoline/jumoline.ins
-- test/sample-book/src/vendor/jumoline/lppl.txt
 - test/syntax-book/Gemfile
 - test/syntax-book/Rakefile
 - test/syntax-book/appA.re
@@ -322,7 +345,6 @@ files:
 - test/syntax-book/sty/reviewmacro.sty
 - test/syntax-book/style.css
 - test/syntax-book/syntax.dic
-- test/test.re
 - test/test_book.rb
 - test/test_book_chapter.rb
 - test/test_book_part.rb
@@ -345,8 +367,10 @@ files:
 - test/test_image_finder.rb
 - test/test_index.rb
 - test/test_latexbuilder.rb
+- test/test_latexbuilder_v2.rb
 - test/test_lineinput.rb
 - test/test_location.rb
+- test/test_logger.rb
 - test/test_makerhelper.rb
 - test/test_markdownbuilder.rb
 - test/test_md2inaobuilder.rb
@@ -363,6 +387,16 @@ files:
 - test/test_webtocprinter.rb
 - test/test_yamlloader.rb
 - test/test_zip_exporter.rb
+- vendor/jumoline/README
+- vendor/jumoline/jumoline.dtx
+- vendor/jumoline/jumoline.ins
+- vendor/jumoline/lppl.txt
+- vendor/plistings/.gitignore
+- vendor/plistings/LICENSE
+- vendor/plistings/README.md
+- vendor/plistings/plistings.sty
+- vendor/plistings/test1.tex
+- vendor/plistings/test2.tex
 homepage: http://github.com/kmuto/review
 licenses:
 - LGPL
@@ -388,7 +422,6 @@ signing_key:
 specification_version: 4
 summary: 'Re:VIEW: a easy-to-use digital publishing system'
 test_files:
-- test/CHAPS
 - test/assets/black.eps
 - test/assets/fit.png
 - test/assets/large.gif
@@ -398,7 +431,6 @@ test_files:
 - test/assets/test.xml.erb
 - test/assets/test_template.tex
 - test/assets/test_template_backmatter.tex
-- test/bib.re
 - test/book_test_helper.rb
 - test/run_test.rb
 - test/sample-book/README.md
@@ -416,10 +448,6 @@ test_files:
 - test/sample-book/src/sty/reviewmacro.sty
 - test/sample-book/src/style-web.css
 - test/sample-book/src/style.css
-- test/sample-book/src/vendor/jumoline/README
-- test/sample-book/src/vendor/jumoline/jumoline.dtx
-- test/sample-book/src/vendor/jumoline/jumoline.ins
-- test/sample-book/src/vendor/jumoline/lppl.txt
 - test/syntax-book/Gemfile
 - test/syntax-book/Rakefile
 - test/syntax-book/appA.re
@@ -445,7 +473,6 @@ test_files:
 - test/syntax-book/sty/reviewmacro.sty
 - test/syntax-book/style.css
 - test/syntax-book/syntax.dic
-- test/test.re
 - test/test_book.rb
 - test/test_book_chapter.rb
 - test/test_book_part.rb
@@ -468,8 +495,10 @@ test_files:
 - test/test_image_finder.rb
 - test/test_index.rb
 - test/test_latexbuilder.rb
+- test/test_latexbuilder_v2.rb
 - test/test_lineinput.rb
 - test/test_location.rb
+- test/test_logger.rb
 - test/test_makerhelper.rb
 - test/test_markdownbuilder.rb
 - test/test_md2inaobuilder.rb

data/lib/review/unfold.rb

@@ -1,129 +0,0 @@
-# Copyright (c) 2007-2017 Kenshi Muto
-#               2002-2007 Minero Aoki
-#
-# This program is free software.
-# You can distribute or modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-# For details of LGPL, see the file "COPYING".
-#
-
-require 'review/preprocessor'
-require 'stringio'
-
-module ReVIEW
-  class WrongInput < Error; end
-
-  class Unfold
-    # unfold paragraphs and strip preprocessor tags.
-    def self.unfold_author_source(s)
-      unfold(Preprocessor::Strip.new(StringIO.new(s)))
-    end
-
-    def self.unfold(f)
-      new.unfold(f)
-    end
-
-    def initialize(indent_paragraph = false)
-      @indent_paragraph = indent_paragraph
-    end
-
-    # unfold(f) -> String
-    # unfold(input, output) -> nil
-    def unfold(input, output = nil)
-      if output
-        @output = output
-        do_unfold input
-        nil
-      else
-        @output = StringIO.new
-        do_unfold input
-        @output.string
-      end
-    end
-
-    private
-
-    ZSPACE = "\241\241".freeze # EUC-JP zen-kaku space
-
-    def do_unfold(input)
-      @blank_needed = false
-      first = true
-      indent = @indent_paragraph ? ZSPACE : ''
-      f = LineInput.new(input)
-      f.each_line do |line|
-        case line
-        when /\A\#@/
-          raise "must not happen: input includes preproc directive: #{line.inspect}"
-        when /\A=/
-          if first
-            first = false
-          else
-            blank
-          end
-          println line
-          # blank
-        when /\A\s+\*/
-          blank
-          println line
-          skip_block f, /\A\s+\*|\A\s+\S/
-          blank
-        when /\A\s+\d+\./
-          blank
-          println line
-          skip_block f, /\A\s+\d+\.|\A\s+\S/
-          blank
-        when /\A:/
-          blank
-          println line
-          skip_block f, /\A:|\A\s+\S/
-          blank
-        when %r{\A//\w.*\{\s*\z}
-          blank
-          println line
-          f.until_terminator(%r{\A//\}}) do |s|
-            println s
-          end
-          println '//}'
-          blank
-        when %r{\A//\w}
-          blank
-          println line
-          blank
-        when /\A\S/
-          if %r{\A//\[} =~ line
-            $stderr.puts "warning: #{f.path}:#{f.lineno}: paragraph begin with `//['; missing ReVIEW directive name?"
-          end
-          flush_blank
-          @output.print indent + line.rstrip
-          f.until_match(%r{\A\s*\z|\A//\w}) { |s| @output.print s.rstrip }
-          @output.puts
-        else
-          unless line.strip.empty?
-            raise WrongInput, "#{f.path}:#{f.lineno}: wrong input: #{line.inspect}"
-          end
-        end
-      end
-    end
-
-    def skip_block(f, re)
-      f.while_match(re) do |line|
-        @output.puts line.rstrip
-      end
-    end
-
-    def blank
-      @blank_needed = true
-    end
-
-    def println(s)
-      flush_blank
-      @output.puts s.rstrip
-    end
-
-    def flush_blank
-      return unless @blank_needed
-      @output.puts
-      @blank_needed = false
-    end
-  end
-end # module ReVIEW

data/test/CHAPS

@@ -1,2 +0,0 @@
-test.re
-bib.re

data/test/bib.re

@@ -1,13 +0,0 @@
-
-//bibpaper[lins][Lins, 1991]{
-Refael D. Lins. A shared memory architecture for parallel study of
-algorithums for cyclic reference_counting. Technical Report 92,
-Computing Laboratory, The University of Kent at Canterbury , August
-1991
-//}
-
-//bibpaper[nari][nari, 1991]{
-nari paper
-//}
-
-//bibpaper[nari][Hogefuge]

data/test/test.re

@@ -1,43 +0,0 @@
-= 見出し
-以下を実行
-//emlist{
-./bin/review-compile --hdnumberingmode test.re --target=html
-}
-== 節１
-
-== 節２
-
-==[column]コラム
-
-== 節３
-
-ソースコードの引用
-
-//source[/hello/world.rb]{
- puts "hello world!"
-//}
-
-■行番号付きキャプションなしリスト
-//emlistnum{
-hoge
-fuge
-//}
-
-■行番号付きキャプションありリスト
-//listnum[hoge][ほげ]{
-hoge
-fuge
-//}
-
-ほげは@<list>{hoge}でもわかるとおり
-
-■本文中でのソースコード引用
-擬似コード内のの@<code>{p = obj.ref_cnt}では…
-
-■参考文献の参照方法
-…がしられています( @<bib>{lins} )
-
-
-//emlist{
-hoge
-//}