review 1.5.0 → 1.6.0

data/lib/review/htmlutils.rb

@@ -47,7 +47,12 @@ module ReVIEW
 
     def highlight(ops)
       body = ops[:body] || ''
-      lexer = ops[:lexer].blank? ? 'text' : ops[:lexer]
+      if @book.config["highlight"] && @book.config["highlight"]["lang"]
+        lexer = @book.config["highlight"]["lang"] # default setting
+      else
+        lexer = 'text'
+      end
+      lexer = ops[:lexer] if ops[:lexer].present?
       format = ops[:format] || ''
       options = {:nowrap => true, :noclasses => true}
       if ops[:options] && ops[:options].kind_of?(Hash)

data/lib/review/i18n.rb

@@ -67,11 +67,10 @@ module ReVIEW
         user_i18n.delete("locale")
         @store[locale].merge!(user_i18n)
       else
-        key = user_i18n.keys.first
-        if !user_i18n[key].kind_of? Hash
-          raise KeyError, "Invalid locale file: #{path}"
+        user_i18n.each do |key, values|
+          raise KeyError, "Invalid locale file: #{path}" unless values.kind_of? Hash
+          @store[key].merge!(values)
         end
-        @store.merge!(user_i18n)
       end
     end
 

data/lib/review/i18n.yml

@@ -139,6 +139,7 @@ zh_TW:
   aut: "著作人"
   csl: "監　修"
   dsr: "美術編輯"
+  ill: "插　畫"
   cov: "封面設計"
   edt: "編　輯"
   pht: "攝　影"
@@ -155,4 +156,14 @@ zh_TW:
   published_by1: "%s %s 出版"
   published_by2: "%s 出版"
   published_by3: "%s %s"
+  date_format: '%%Y年%%-m月%%-d日'
   impression: "刷"
+  toctitle: "目次"
+  covertitle: "封面"
+  titlepagetitle: "標題頁"
+  originaltitle: "原標題頁"
+  credittitle: "Credit"
+  colophontitle: "版權頁"
+  advtitle: "廣告"
+  profiletitle: "作者介紹"
+  backcovertitle: "封底"

data/lib/review/idgxmlbuilder.rb

@@ -1143,7 +1143,7 @@ module ReVIEW
       puts %Q[<caption>#{compile_inline(caption)}</caption>]
     end
 
-    def source_body(lines)
+    def source_body(lines, lang)
       puts %Q[<pre>]
       codelines_body(lines)
       puts %Q[</pre></source>]
@@ -1174,10 +1174,10 @@ module ReVIEW
       if chap.number
         n = chap.headline_index.number(id)
         if @book.config["secnolevel"] >= n.split('.').size
-          return "「#{n}　#{compile_inline(chap.headline(id).caption)}」"
+          return I18n.t("chapter_quote", "#{n}　#{compile_inline(chap.headline(id).caption)}")
         end
       end
-      "「#{compile_inline(chap.headline(id).caption)}」"
+      I18n.t("chapter_quote", compile_inline(chap.headline(id).caption))
     end
 
     def inline_recipe(id)

data/lib/review/latexbuilder.rb

@@ -320,7 +320,12 @@ module ReVIEW
         caption_str = "\\relax" ## dummy charactor to remove lstname
         print "\\vspace{-1.5em}"
       end
-      lexer = lang || ""
+      if @book.config["highlight"] && @book.config["highlight"]["lang"]
+        lexer = @book.config["highlight"]["lang"] # default setting
+      else
+        lexer = ""
+      end
+      lexer = lang if lang.present?
       body = lines.inject(''){|i, j| i + detab(unescape_latex(j)) + "\n"}
       puts "\\begin{"+command+"}["+title+"={"+caption_str+"},language={"+ lexer+"}]"
       print body
@@ -328,14 +333,18 @@ module ReVIEW
       blank
     end
 
-    def source(lines, caption)
-      puts '\begin{reviewlist}'
-      puts macro('reviewlistcaption', compile_inline(caption))
-      lines.each do |line|
-        puts detab(line)
+    def source(lines, caption, lang = nil)
+      if highlight_listings?
+        common_code_block_lst(lines, 'reviewlistlst', 'title', caption, lang)
+      else
+        puts '\begin{reviewlist}'
+        puts macro('reviewlistcaption', compile_inline(caption))
+        lines.each do |line|
+          puts detab(line)
+        end
+        puts '\end{reviewlist}'
+        puts ""
       end
-      puts '\end{reviewlist}'
-      puts ""
     end
 
 
@@ -751,9 +760,9 @@ module ReVIEW
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
       if chap.number and @book.config["secnolevel"] >= n.split('.').size
-        str = "「#{chap.headline_index.number(id)} #{compile_inline(chap.headline(id).caption)}」"
+        str = I18n.t("chapter_quote", "#{chap.headline_index.number(id)} #{compile_inline(chap.headline(id).caption)}")
       else
-        str = "「#{compile_inline(chap.headline(id).caption)}」"
+        str = I18n.t("chapter_quote", compile_inline(chap.headline(id).caption))
       end
       if @book.config["chapterlink"]
         anchor = n.gsub(/\./, "-")

data/lib/review/layout.tex.erb

@@ -52,7 +52,7 @@
 <%   else %>
 \usepackage{listings}
 <%   end %>
-\renewcommand{\lstlistingname}{<%I18n.t("list")%>}
+\renewcommand{\lstlistingname}{<%= I18n.t("list")%>}
 \lstset{%
   breaklines=true,%
   breakautoindent=false,%
@@ -250,7 +250,7 @@
         <%= authors %>
       \end{tabular}\par}%
     \vfill
-    {\large <%= values["date"] %> <%= I18n.t("version")%>\hspace{2zw}<%= I18n.t("published_by", values["prt"])%>\par}%
+    {\large <%= values["date"] %> <%= I18n.t("edition")%>\hspace{2zw}<%= I18n.t("published_by", values["prt"])%>\par}%
 \vskip4zw\mbox{}
   \end{center}%
 \end{titlepage}
@@ -260,6 +260,17 @@
 \renewcommand{\chaptermark}[1]{{}}
 \frontmatter
 
+%%% originaltitle
+<% if values["originaltitlefile"] %>
+<%= custom_originaltitlepage %>
+<% end %>
+
+%%% credit
+<% if values["creditfile"] %>
+<%= custom_creditpage %>
+<% end %>
+
+
 %% preface
 <%= values["pre_str"] %>
 
@@ -284,7 +295,22 @@
 <%= values["post_str"] %>
 <% end %>
 
+
+%%% profile
+<% if values["profile"] %>
+<%= custom_profilepage %>
+<% end %>
+
+%%% advfile
+<% if values["advfile"] %>
+<%= custom_advfilepage %>
+<% end %>
+
+%%% colophon
 <% if values["colophon"] %>
+<%   if custom_colophonpage %>
+<%= custom_colophonpage %>
+<%   else %>
 %% okuduke
 \reviewcolophon
 \thispagestyle{empty}
@@ -303,7 +329,12 @@
 　\\
 \rule[0pt]{14cm}{1pt} \\
 <%= values["rights"] %> \\
+<%   end %>
 <% end %>
 
+%%% backcover
+<% if values["backcover"] %>
+<%= custom_backcoverpage %>
+<% end %>
 
 \end{document}

data/lib/review/lineinput.rb

@@ -0,0 +1,17 @@
+require 'lineinput'
+
+module ReVIEW
+  class LineInput < LineInput
+    def skip_comment_lines
+      n = 0
+      while line = gets()
+        unless line.strip =~ /\A\#@/
+          ungets line
+          return n
+        end
+        n += 1
+      end
+      n
+    end
+  end
+end

data/lib/review/pdfmaker.rb

@@ -22,6 +22,10 @@ module ReVIEW
     include FileUtils
     include ReVIEW::LaTeXUtils
 
+    def initialize
+      @basedir = Dir.pwd
+    end
+
     def system_or_raise(*args)
       Kernel.system(*args) or raise("failed to run command: #{args.join(' ')}")
     end
@@ -97,7 +101,6 @@ module ReVIEW
 
     def generate_pdf(config, yamlfile)
       check_book(config)
-      @basedir = Dir.pwd
       @path = build_path(config)
       bookname = config["bookname"]
       Dir.mkdir(@path)
@@ -217,10 +220,10 @@ module ReVIEW
       end
     end
 
-    def make_custom_titlepage(coverfile)
-      coverfile_sty = coverfile.to_s.sub(/\.[^.]+$/, ".tex")
-      if File.exist?(coverfile_sty)
-        File.read(coverfile_sty)
+    def make_custom_page(file)
+      file_sty = file.to_s.sub(/\.[^.]+$/, ".tex")
+      if File.exist?(file_sty)
+        File.read(file_sty)
       else
         nil
       end
@@ -275,7 +278,16 @@ module ReVIEW
       okuduke = make_colophon(config)
       authors = make_authors(config)
 
-      custom_titlepage = make_custom_titlepage(config["coverfile"])
+      custom_titlepage = make_custom_page(config["cover"]) || make_custom_page(config["coverfile"])
+      custom_originaltitlepage = make_custom_page(config["originaltitlefile"])
+      custom_creditpage = make_custom_page(config["creditfile"])
+
+      custom_profilepage = make_custom_page(config["profile"])
+      custom_advfilepage = make_custom_page(config["advfile"])
+      if config["colophon"] && config["colophon"].kind_of?(String)
+        custom_colophonpage = make_custom_page(config["colophon"])
+      end
+      custom_backcoverpage = make_custom_page(config["backcover"])
 
       template = File.expand_path('layout.tex.erb', File.dirname(__FILE__))
       layout_file = File.join(@basedir, "layouts", "layout.tex.erb")

data/lib/review/topbuilder.rb

@@ -756,7 +756,7 @@ module ReVIEW
       nofunc_text("[UnknownChapter:#{id}]")
     end
 
-    def source(lines, caption = nil)
+    def source(lines, caption = nil, lang = nil)
       base_block "source", lines, caption
     end
 

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/review.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary     = "Re:VIEW: a easy-to-use digital publishing system"
   gem.description = "Re:VIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX."
   gem.required_rubygems_version = Gem::Requirement.new(">= 0") if gem.respond_to? :required_rubygems_version=
-  gem.date = "2015-02-28"
+  gem.date = "2015-06-29"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/assets/test_template.tex

@@ -0,0 +1,255 @@
+\documentclass[oneside]{jsbook}
+\usepackage[deluxe]{otf}
+\usepackage[dvipdfmx]{color}
+\usepackage[dvipdfmx]{graphicx}
+\usepackage{framed}
+\usepackage{wrapfig}
+\definecolor{shadecolor}{gray}{0.9}
+\definecolor{shadecolorb}{gray}{0.1}
+\definecolor{reviewgreen}{rgb}{0,0.4,0}
+\definecolor{reviewblue}{rgb}{0.2,0.2,0.4}
+\definecolor{reviewred}{rgb}{0.7,0,0}
+\definecolor{reviewdarkred}{rgb}{0.3,0,0}
+\usepackage[utf8]{inputenc}
+\usepackage{ascmac}
+\usepackage{float}
+\usepackage{alltt}
+\usepackage{amsmath}
+
+%% if you use @<u>{} (underline), use jumoline.sty
+%%\usepackage{jumoline}
+
+\newenvironment{shadedb}{%
+  \def\FrameCommand{\fboxsep=\FrameSep \colorbox{shadecolorb}}%
+  \MakeFramed {\FrameRestore}}%
+ {\endMakeFramed}
+
+\usepackage[top=10zw,bottom=12zw,left=10zw,right=10zw]{geometry}
+%\usepackage[top=5zw,bottom=5zw,left=1zw,right=1zw]{geometry}
+
+
+\newcommand{\parasep}{\vspace*{3zh}}
+\setlength{\footskip}{30pt}
+
+%% Bookmarkの文字化け対策（日本語向け）
+\ifnum 46273=\euc"B4C1 % 46273 == 0xB4C1 == 漢(EUC-JP)
+  \usepackage{atbegshi}%
+  \AtBeginShipoutFirst{\special{pdf:tounicode EUC-UCS2}}%
+  %%\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}%
+\else
+  \usepackage{atbegshi}%
+  \AtBeginShipoutFirst{\special{pdf:tounicode 90ms-RKSJ-UCS2}}%
+  %%\AtBeginDvi{\special{pdf:tounicode 90ms-RKSJ-UCS2}}%
+\fi
+
+\usepackage[dvipdfm,bookmarks=true,bookmarksnumbered=true,colorlinks=true,%
+            pdftitle={Re:VIEW Sample Book},%
+            pdfauthor={}]{hyperref}
+
+
+
+\newenvironment{reviewimage}{%
+  \begin{figure}[H]
+    \begin{center}}{%
+    \end{center}
+  \end{figure}}
+
+\newenvironment{reviewdummyimage}{%
+  \begin{figure}[H]
+    \begin{center}\begin{alltt}}{%
+    \end{alltt}\end{center}
+  \end{figure}}
+
+\newenvironment{reviewemlist}{%
+  \medskip\small\begin{shaded}\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
+  \end{alltt}\end{shaded}}
+
+\newenvironment{reviewlist}{%
+  \begin{shaded}\small\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
+  \end{alltt}\end{shaded}\par\vspace*{0.5zw}}
+
+\newenvironment{reviewcmd}{%
+  \color{white}\medskip\small\begin{shadedb}\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
+  \end{alltt}\end{shadedb}}
+
+\newenvironment{reviewbox}{%
+  \medskip\small\begin{framed}\setlength{\baselineskip}{1.3zw}\begin{alltt}}{%
+  \end{alltt}\end{framed}}
+
+\newenvironment{reviewtable}[1]{%
+  \begin{center}\small\setlength{\baselineskip}{1.2zw}
+    \begin{tabular}{#1}}{%
+    \end{tabular}
+  \end{center}}
+
+\newenvironment{reviewcolumn}{%
+     \begin{framed}
+   }{%
+      \end{framed}
+  \vspace{2zw}}
+
+\newcommand{\reviewcolumnhead}[2]{%
+{\noindent\large ■コラム: #2}}
+
+\newcommand{\reviewtablecaption}[1]{%
+  \caption{#1}}
+
+\newcommand{\reviewbackslash}[0]{%
+  \textbackslash{}}
+
+\newcommand{\reviewlistcaption}[1]{%
+  \medskip{\small\noindent #1}\vspace*{-1.3zw}}
+
+\newcommand{\reviewemlistcaption}[1]{%
+  \medskip{\small\noindent #1}\vspace*{-1.3zw}}
+
+\newcommand{\reviewcmdcaption}[1]{%
+  \medskip{\small\noindent #1}\vspace*{-1.3zw}}
+
+\newcommand{\reviewindepimagecaption}[1]{%
+  \begin{center}#1\end{center}}
+
+\newcommand{\reviewboxcaption}[1]{%
+  \medskip{\small\noindent #1}\vspace*{-1.3zw}}
+
+\newcommand{\reviewimageref}[2]{%
+  図 #1}
+\newcommand{\reviewtableref}[2]{%
+  表 #1}
+\newcommand{\reviewlistref}[1]{%
+  リスト #1}
+\newcommand{\reviewbibref}[2]{%
+  #1}
+\newcommand{\reviewcolumnref}[2]{%
+  コラム #1}
+\newcommand{\reviewsecref}[2]{%
+  #1}
+
+\newcommand{\reviewminicolumntitle}[1]{%
+  {\large ■メモ: #1}\\}
+
+
+
+\newenvironment{reviewminicolumn}{%
+  \vspace{1.5zw}\begin{screen}}{%
+  \end{screen}\vspace{2zw}}
+
+\newcommand{\reviewkw}[1]{%
+  \textbf{\textgt{#1}}}
+
+\newcommand{\reviewami}[1]{%
+  \mask{#1}{A}}
+
+\newcommand{\reviewem}[1]{%
+  \textbf{#1}}
+
+\newcommand{\reviewstrong}[1]{%
+  \textbf{#1}}
+
+%% @<del> is ignored in LaTeX with default style
+\newcommand{\reviewstrike}[1]{#1}
+
+%%%% for ulem.sty:
+%%\renewcommand{\reviewstrike}[1]{\sout{#1}}
+%%
+%%%% for jumoline.sty:
+%%\renewcommand{\reviewstrike}[1]{\Middleline{#1}}
+
+\newcommand{\reviewth}[1]{%
+  \textgt{#1}}
+
+\newcommand{\reviewtitlefont}[0]{%
+  \usefont{T1}{phv}{b}{n}\gtfamily}
+
+\newcommand{\reviewmainfont}[0]{%
+ }
+
+\newcommand{\reviewcolophon}[0]{%
+  \clearpage}
+\newcommand{\reviewappendix}[0]{%
+  \appendix}
+
+\makeatletter
+%% maxwidth is the original width if it is less than linewidth
+%% otherwise use linewidth (to make sure the graphics do not exceed the margin)
+\def\maxwidth{%
+  \ifdim\Gin@nat@width>\linewidth
+    \linewidth
+  \else
+    \Gin@nat@width
+  \fi
+}
+\makeatother
+
+
+
+\usepackage[T1]{fontenc}
+
+\begin{document}
+
+\reviewmainfont
+
+
+
+\begin{titlepage}
+  
+\thispagestyle{empty}
+\begin{center}%
+  \mbox{} \vskip5zw
+   \reviewtitlefont%
+    {\Huge Re:VIEW Sample Book \par}%
+    \vskip 15em%
+    {\huge
+      \lineskip .75em
+      \begin{tabular}[t]{c}%
+        
+      \end{tabular}\par}%
+    \vfill
+    {\large 2011-01-01 版\hspace{2zw} 発行\par}%
+\vskip4zw\mbox{}
+  \end{center}%
+\end{titlepage}
+
+
+
+\renewcommand{\chaptermark}[1]{{}}
+\frontmatter
+
+%%% originaltitle
+
+
+%%% credit
+
+
+
+%% preface
+
+
+
+
+\renewcommand{\chaptermark}[1]{\markboth{\prechaptername\thechapter\postchaptername~#1}{}}
+\mainmatter
+
+\renewcommand{\chaptermark}[1]{\markboth{\appendixname\thechapter~#1}{}}
+\reviewappendix
+
+
+%% backmatter begins
+
+
+
+
+
+%%% profile
+
+
+%%% advfile
+
+
+%%% colophon
+
+
+%%% backcover
+
+
+\end{document}