rb_latex 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9340241294fb887b1302e3e807067f3747ffdc42e068c20b561415fd7c7f55
-  data.tar.gz: a4d435a081863e558f0af4c462aa11e056412a6546bc5c86118b3af9f6970fda
+  metadata.gz: bd8e99354f0b7d152e5466c710c743e515de594eb09a56f0265c648d1ccd262b
+  data.tar.gz: 3a8bf199de7ab0a7f34180944b4e7caee6acd68012dd1905aaeaaa31d600ec40
 SHA512:
-  metadata.gz: '090761fdba380cb25eb210e0464bdd81b5a7f0d9f084e086c70b82388c6bb99bd07d9a1c83112ccd19050a16568ee91be3771d8861f73cd18716206b784483da'
-  data.tar.gz: 06d79fd6fa249e19204527e5304531182996c6f287b3f3a6adc211b4f83faae2b2d181fb2a6c14b31762e3fe7ca077ab8486466ac95ea5aac1f7b1eb607466a6
+  metadata.gz: 348c9651bdae4cdec8fa1b20215653849663b624e65c0f4d81de8992a807d94443331d7c52a781eaa6a1d49f52488379ceb0fddd45d784ab068ed658be344890
+  data.tar.gz: 63412c101551da4bdf69ed111c5628beda8d862d28b63a9f4019643da124b8c6ab22070aa9846d2bd4ea7b4a09fac6f9813264baf750fb8ea66b7a8d37570438

data/lib/rb_latex/maker.rb

@@ -8,6 +8,9 @@ module RbLatex
     extend Forwardable
 
     attr_accessor :document_class
+    attr_accessor :latex_command
+    attr_accessor :dvipdf_command
+    attr_accessor :debug
 
     RbLatex::MetaInfo::ATTRS.each do |name|
       def_delegator :@meta_info, name
@@ -30,9 +33,10 @@ module RbLatex
       @work_dir = ".rblatex_work"
       @item_list = RbLatex::ItemList.new
       @meta_info = RbLatex::MetaInfo.new
-      @latex_cmd = "uplatex"
-      @dvipdfmx_cmd = "dvipdfmx"
+      @latex_command = "uplatex"
+      @dvipdf_command = "dvipdfmx"
       @document_class = ["jlreq", "book,b5paper,openany"]
+      @debug = nil
     end
 
     def default_config
@@ -49,14 +53,15 @@ module RbLatex
         Dir.chdir(dir) do
           generate_src(dir)
           exec_latex(dir)
-          exec_dvipdfmx(dir)
+          exec_dvipdf(dir)
         end
+        FileUtils.cp(File.join(dir, "book.pdf"), filename)
       end
     end
 
     def copy_files(dir)
       Dir.entries(@root_dir).each do |path|
-        next if path == "." or path == ".."
+        next if path == "." or path == ".." or path =~ /\A\.rblatex/
         FileUtils.cp_r(File.join(@root_dir, path), dir, dereference_root: true)
       end
     end
@@ -69,27 +74,32 @@ module RbLatex
       end
       book_tex = apply_template("book.tex.erb")
       File.write(File.join(dir, "book.tex"), book_tex)
+      rblatexdefault_sty = apply_template("rblatexdefault.sty")
+      File.write(File.join(dir, "rblatexdefault.sty"), rblatexdefault_sty)
     end
 
     def exec_latex(dir)
-      cmd = "#{@latex_cmd} book.tex"
+      cmd = "#{@latex_command} book.tex"
       3.times do |i|
         out, status = Open3.capture2e(cmd)
         if !status.success?
           @error_log = out
-          raise RbLatex::Error, "fail to exec latex #{i}: #{cmd}"
+          if @debug
+            print STDERR, @error_log, "\n"
+          end
+          raise RbLatex::Error, "fail to exec latex (#{i}): #{cmd}"
         end
       end
     end
 
-    def exec_dvipdfmx(dir)
-      cmd = "#{@dvipdfmx_cmd} book.dvi"
+    def exec_dvipdf(dir)
+      return unless @dvipdf_command
+      cmd = "#{@dvipdf_command} book.dvi"
       out, status = Open3.capture2e(cmd)
       if !status.success?
         @error_log = out
-        raise RbLatex::Error, "fail to exec latex #{i}: #{cmd}"
+        raise RbLatex::Error, "fail to exec dvipdf: #{cmd}"
       end
-      FileUtils.cp("book.pdf", File.join(@root_fullpath, "book.pdf"))
     end
 
     def work_dir=(dir)

data/lib/rb_latex/version.rb

@@ -1,3 +1,3 @@
 module RbLatex
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/templates/book.tex.erb

@@ -1,33 +1,20 @@
 \documentclass[<%= @dclass_opt %>]{<%= @dclass %>}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{plext}
-\usepackage{listings}
-\usepackage[dvipdfmx]{hyperref}
-\usepackage{pxjahyper}
-\usepackage{fancyvrb}
-\usepackage{amssymb}
-\usepackage{amsmath}
-\usepackage{amsthm}
-\usepackage{amsfonts}
-\usepackage{longtable}
-\usepackage{graphicx}
-\usepackage{pxrubrica}
-\newcommand{\rblatexNewpage}{\newpage}
 
-%%\usepackage{acronym}
-
-\VerbatimFootnotes
-
-\hypersetup{colorlinks=false,urlcolor=blue}
+<% if @latex_command =~ /lualatex/ %>
+\usepackage[luatex]{rblatexdefault}
+<% else %>
+\usepackage[dvipdfmx]{rblatexdefault}
+<% end %>
 
-\setlength{\parindent}{0pt}
+\IfFileExists{rblatexcustom.sty}{
+\usepackage{rblatexcustom}
+}
 
 \begin{document}
 <% @item_list.filenames.each_with_index do |filename, idx| %>
 \input{<%= filename %>}
 <% if @item_list.filenames.size > idx + 1 %>
-\rblatexNewpage
+\rblatexFileSeparator
 <% end %>
 <% end %>
 \end{document}

data/templates/rblatexdefault.sty

@@ -0,0 +1,39 @@
+\ProvidesPackage{rblatexdefault}[2018/05/09 v1.0]
+
+\newif\ifrblatex@luatex
+\rblatex@luatexfalse
+\newif\ifrblatex@dvipdfmx
+\rblatex@dvipdfmxfalse
+\DeclareOption{luatex}{\rblatex@luatextrue}
+\DeclareOption{dvipdfmx}{\rblatex@dvipdfmxtrue}
+\ProcessOptions\relax
+
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+\RequirePackage{listings}
+\RequirePackage{fancyvrb}
+\RequirePackage{amssymb}
+\RequirePackage{amsmath}
+\RequirePackage{amsthm}
+\RequirePackage{amsfonts}
+\RequirePackage{longtable}
+\RequirePackage{graphicx}
+\RequirePackage{pxrubrica}
+
+\ifrblatex@luatex%
+\RequirePackage[luatex,pdfencoding=auto]{hyperref}
+\RequirePackage{lltjext}
+\fi
+
+\ifrblatex@dvipdfmx%
+\RequirePackage[dvipdfmx]{hyperref}
+\RequirePackage{pxjahyper}
+\RequirePackage{plext}
+\fi
+
+%%\hypersetup{colorlinks=false,urlcolor=blue}
+\VerbatimFootnotes
+\setlength{\parindent}{0pt}
+\newcommand{\rblatexFileSeparator}{\newpage}
+
+\endinput

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb_latex
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,7 @@ files:
 - lib/rb_latex/version.rb
 - rb_latex.gemspec
 - templates/book.tex.erb
+- templates/rblatexdefault.sty
 homepage: https://github.com/takahashim/rb_latex
 licenses: []
 metadata: {}