rb_latex 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0b9a42b31411e59612673356412e6f753f6d8786a0218a144473718e3f49d5f
-  data.tar.gz: 271eb929d4d760929d7b4a42ff122022c57dcf91a262669f50dfb9836b9adf86
+  metadata.gz: dad0ca7be7d5e599b0d18cb0f14a5b687375159b581ce703c1f736e06128ac40
+  data.tar.gz: 901e7d2140823b9faa57d1f8085d8cdc063da5680de6e83489458c9cd4c1e805
 SHA512:
-  metadata.gz: 55275c961565f9baf3b50299c59fa2f372ff51424a7868bff72797e60df37d14ea779582664d8836154ef81d98db34cc599c8f81955b835d37804fe6a50d9bfb
-  data.tar.gz: 48dfbb3ed6f6be6a48ea1fd486177e64cca9a13ebe5b20220e99c01391af7733777de3a728777b8c06559fbc775a8c33a00cd19484c84310a0c6eba913194bdc
+  metadata.gz: d97a6af5181ee7d18311a73630200dbb0dbb245dcca3971b6e4e95dabe9561832b7afd0b492f4955d173261402c30a8c681a7bf9207ed29948a7150cacfa4410
+  data.tar.gz: 7be3517b348028970c83a84bad4b90028db1fea4c70a9a257791c384841cb2895a7cd0feeb6e93845f88e92828c9fbc450a06dc9edf6eb4638ad299f478e3463

data/lib/rb_latex/maker.rb

@@ -11,6 +11,8 @@ module RbLatex
     attr_accessor :latex_command
     attr_accessor :dvipdf_command
     attr_accessor :debug
+    attr_accessor :book_name
+    attr_reader :work_dir
 
     RbLatex::MetaInfo::ATTRS.each do |name|
       def_delegator :@meta_info, name
@@ -18,18 +20,11 @@ module RbLatex
       def_delegator :@meta_info, name_eq
     end
 
-    def_delegator :@meta_info, :date
-    def_delegator :@meta_info, :date=
-    def_delegator :@meta_info, :lastmodified
-    def_delegator :@meta_info, :lastmodified=
-    def_delegator :@meta_info, :add_creator
-
-    attr_reader :work_dir
+    def_delegators :@meta_info, :date, :date=, :lastmodified, :lastmodified=, :add_creator
 
     def initialize(root_dir)
       @root_dir = root_dir
       @root_fullpath = File.absolute_path(root_dir)
-      @config = default_config
       @work_dir = ".rblatex_work"
       @item_list = RbLatex::ItemList.new
       @meta_info = RbLatex::MetaInfo.new
@@ -37,16 +32,18 @@ module RbLatex
       @dvipdf_command = "dvipdfmx"
       @document_class = ["jlreq", "book,b5paper,openany"]
       @debug = nil
-    end
-
-    def default_config
-      {}
+      @book_name = "book"
+      @default_option = nil
     end
 
     def add_item(filename, content)
       @item_list.add_item(filename, content)
     end
 
+    def book_filename(ext = ".pdf")
+      "#{@book_name}#{ext}"
+    end
+
     def generate_pdf(filename, debug: nil)
       in_working_dir(debug) do |dir|
         copy_files(dir)
@@ -54,7 +51,7 @@ module RbLatex
           generate_src(dir)
           compile_latex(dir)
         end
-        FileUtils.cp(File.join(dir, "book.pdf"), filename)
+        FileUtils.cp(File.join(dir, book_filename), filename)
       end
     end
 
@@ -67,18 +64,21 @@ module RbLatex
 
     def generate_src(dir)
       @item_list.generate(dir)
-      @dclass, @dclass_opt = @document_class
-      if @meta_info.page_progression_direction == "rtl" && !@dclass_opt.split(",").include?("tate")
-        @dclass_opt += ",tate"
+      @dclass, @dclass_option = @document_class
+      if @meta_info.page_progression_direction == "rtl" && !@dclass_option.split(",").include?("tate")
+        @dclass_option += ",tate"
+      end
+      if @latex_command =~ /lualatex/
+        @default_option = "lualatex"
       end
       book_tex = apply_template("book.tex.erb")
-      File.write(File.join(dir, "book.tex"), book_tex)
+      File.write(File.join(dir, book_filename(".tex")), book_tex)
       rblatexdefault_sty = apply_template("rblatexdefault.sty")
       File.write(File.join(dir, "rblatexdefault.sty"), rblatexdefault_sty)
     end
 
     def compile_latex(dir)
-      texfile = "book.tex"
+      texfile = book_filename(".tex")
       cmd = "#{@latex_command} #{texfile}"
       3.times do |i|
         out, status = Open3.capture2e(cmd)
@@ -90,7 +90,7 @@ module RbLatex
           raise RbLatex::Error, "fail to exec latex (#{i}): #{cmd}"
         end
       end
-      dvifile = File.basename(texfile, ".*") + ".dvi"
+      dvifile = book_filename(".dvi")
       if File.exist?(dvifile)
         exec_dvipdf(dvifile)
       end

data/lib/rb_latex/version.rb

@@ -1,3 +1,3 @@
 module RbLatex
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/templates/book.tex.erb

@@ -1,11 +1,9 @@
-\documentclass[<%= @dclass_opt %>]{<%= @dclass %>}
+\documentclass[<%= @dclass_option %>]{<%= @dclass %>}
 
-<% if @latex_command =~ /lualatex/ %>
-\usepackage[luatex]{rblatexdefault}
-<% else %>
-\usepackage[dvipdfmx]{rblatexdefault}
-<% end %>
+%% load RbLatex default stlye
+\usepackage[<%= @default_option %>]{rblatexdefault}
 
+%% load RbLatex custom style (if you have)
 \IfFileExists{rblatexcustom.sty}{
 \usepackage{rblatexcustom}
 }

data/templates/rblatexdefault.sty

@@ -2,10 +2,7 @@
 
 \newif\ifrblatex@luatex
 \rblatex@luatexfalse
-\newif\ifrblatex@dvipdfmx
-\rblatex@dvipdfmxfalse
 \DeclareOption{luatex}{\rblatex@luatextrue}
-\DeclareOption{dvipdfmx}{\rblatex@dvipdfmxtrue}
 \ProcessOptions\relax
 
 \RequirePackage[utf8]{inputenc}
@@ -17,15 +14,14 @@
 \RequirePackage{amsthm}
 \RequirePackage{amsfonts}
 \RequirePackage{longtable}
-\RequirePackage{graphicx}
 \RequirePackage{pxrubrica}
 
-\ifrblatex@luatex%
+\ifrblatex@luatex
+\RequirePackage[luatex]{graphicx}
 \RequirePackage[luatex,pdfencoding=auto]{hyperref}
 \RequirePackage{lltjext}
-\fi
-
-\ifrblatex@dvipdfmx%
+\else %% default
+\RequirePackage[dvipdfmx]{graphicx}
 \RequirePackage[dvipdfmx]{hyperref}
 \RequirePackage{pxjahyper}
 \RequirePackage{plext}
@@ -35,5 +31,6 @@
 \VerbatimFootnotes
 \setlength{\parindent}{0pt}
 \newcommand{\rblatexFileSeparator}{\newpage}
+\newcommand{\rblatexEmptyLine}{\hspace{0pt}\par}
 
 \endinput

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb_latex
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler