hikiutils 0.2.3.4 → 0.2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db609de3c77ce63017a0ac6ff8aacc8c3faa4939
-  data.tar.gz: 68652266299d5e45e6b5f9297efa99de62afa868
+  metadata.gz: 58f2a85e76e280ec708a8c9045c154442c97b2ea
+  data.tar.gz: 5cfa1cfc1b24bb5d5c1197b1b1fe4f4d92c755f6
 SHA512:
-  metadata.gz: b9143eed042a0d99dcdd49aca92e5802b1c36b308484f070945092a3229b1a5611f17de36140b05a769cc8058d2a082b5d82284e1d6ae5c3c3230ed768d5913d
-  data.tar.gz: 6ce4e64efef302f900a8694b04e34206cb38d61196c91e5a20e3d8a742c8b55a3c7704ac774fa3f91007d35a79133d7c7fda13ab3362fc79fca044ee1aee212b
+  metadata.gz: f41c6b41ee658ce2571d5d2a9b1f3e34d6f23a9dce4a31e7c087c19b94f029b834bfce02bb72d65f30537c7ae94b473bfa3452516b58e239b389f7af0d72cf77
+  data.tar.gz: 098de39f7aede87f3469edee10615a6c915773021156a130c2934271d236afaef1b038270810ff532bf8a458bf311ce6a8984e0c834c0662ce9641bf1c883500

data/exe/hiki

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 
 require "hikiutils"
-#require "hikiutils_thor"
 
 HikiUtils::Command.run(ARGV)
-#CLI::Command.run(ARGV)
-#Hikithor::CLI.start(ARGV)
+

data/exe/hiki_thor

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-#require "hikiutils"
 require "hikiutils_thor"
 
-#HikiUtils::Command.run(ARGV)
-#CLI::Command.run(ARGV)
 Hikithor::CLI.start(ARGV)

data/exe/hiki_thor~

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+#require "hikiutils"
+require "hikiutils_thor"
+
+#HikiUtils::Command.run(ARGV)
+#CLI::Command.run(ARGV)
+Hikithor::CLI.start(ARGV)

data/exe/hiki~

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require "hikiutils"
+#require "hikiutils_thor"
+
+HikiUtils::Command.run(ARGV)
+#CLI::Command.run(ARGV)
+#Hikithor::CLI.start(ARGV)

data/hikiutils.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "hiki2md"
   spec.add_development_dependency "mathjax-yard"
   spec.add_development_dependency "hiki2yard"
+  spec.add_development_dependency "hiki2latex", "~>0.9.12.1"
   spec.add_runtime_dependency "systemu"
   spec.add_runtime_dependency "hikidoc", "~> 0.1.0"
   spec.add_runtime_dependency 'thor'

data/hikiutils_bob/Rakefile

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 require 'systemu'
-require 'tempfile'
 # -*- coding: utf-8 -*-
 begin
   target_dir = File.readlines('./.hikirc')[0].chomp
@@ -102,7 +101,7 @@ def convert_to_latex(file_name, option=nil)
   pre_name = File.join($latex_dir,'pre.tex')
   p pre_command = File.exist?(pre_name) ? '--pre '+pre_name : nil
   lines = File.readlines(file_name)
-  cont = ""
+  cont = ""   #remove figs folder...
   lines.each{|line|
     if m=line.match(/\{\{attach_view\((.*),(.*)\)\}\}/)
       p line="\{\{attach_view\(#{m[1]}\)\}\}\n"
@@ -147,27 +146,6 @@ task :increment do
   exit
 end
 
-desc "numbering figs from the NUBER in FILE"
-task :number do
-  number=ARGV[1].to_i
-  file = ARGV[2]
-  dir = ARGV[3] || nil
-  lines = File.readlines(file)
-  cont = ""
-  lines.each{|line|
-    if m=line.match(/\{\{attach_view\((\w+|_).(\d+).jpeg,(\w+)\)\}\}/)
-      new_num=sprintf("%03d",number)
-      line="\{\{attach_view\(#{m[1]}.#{new_num}.jpeg,#{m[3]}\)\}\}\n"
-      cont << line
-      number += 1
-    else
-      cont << line
-    end
-  }
-  print cont
-  exit
-end
-
 desc "convert fig size SCALE TARGET_DIR"
 task :convert do
   scale = ARGV[1]
@@ -253,15 +231,20 @@ task :check_previous do
     file=   line.split(/\s+/)[-1]
     previous[file]=line.chomp
   }
-  changed = []
+  added,changed = [],[]
   current.each_pair{|key,val|
-    if !previous.include?(key) or previous[key]!=val
+    if !previous.include?(key)
+      added[key]=val
+    elsif previous[key]!=val
       changed << val+"\n"
+    else
+
     end
   }
-  if changed.size != 0
+  if changed.size != 0 or added.size !=0
     print("hiki dirで変更が発生しています．\n")
-    changed.each{|line| print line+"\n"} 
+    changed.each{|line| print line+"\n"}
+    added.each{|line| print line+"\n"}
     exit
   end
 end

data/hikiutils_bob/{private_dir.graffle → hikiutils_bob.graffle}

@@ -1167,7 +1167,7 @@
 		<key>FitInWindow</key>
 		<true/>
 		<key>Frame</key>
-		<string>{{205, 39}, {890, 792}}</string>
+		<string>{{308, 85}, {890, 792}}</string>
 		<key>ListView</key>
 		<false/>
 		<key>OutlineWidth</key>

data/hikiutils_bob/latex_all.hiki

@@ -70,10 +70,11 @@ hikiの初めの部分は，
 >>>
 と変換してくれます．
 
-必要な図は，figsから自動で取るようになっていますが，サイズは解像度が問題のときは手動で調整してください．
+必要な図は，figsから自動で取るようになっていますが，
+サイズや解像度が問題のときは手動で調整してください．
 
 !!rake latex_all手順（ディレクトリー内の一括変換）
-pwdのdirectoryの同名のbasenameに.hikiの拡張子がついたファイルが用意されていて，
+pwdのdirectoryと同名のbasenameに.hikiの拡張子がついたファイルが用意されていて，
  rake latex_all
 をおこなうと自動で全部を一体にまとめた文書へのlatex変換が出来上がります．
 たとえば，hikiutils_bob.hikiの記述を
@@ -88,7 +89,7 @@ bob% cat hikiutils_bob.hiki
 とすると，sync.tex, latex_all.texがlatex_dir内に変換されます．
 さらに，開いているhikiutils_bob.texをTeXShopで変換してみてください．
 
-うまくできないときは[[ここ|http://qiita.com/hideaki_polisci/items/3afd204449c6cdd995c9#51-texshopの設定]]を参照して自力で入れてみてください．だめならdonkey.
+うまくできないときは[[ここ|http://qiita.com/hideaki_polisci/items/3afd204449c6cdd995c9]]を参照して自力で入れてみてください．だめならdonkey.
 
 *{{attach_anchor(hikiutils_bob.pdf,hikiutils_bob)}}
 
@@ -100,6 +101,7 @@ latex_dir内に幾つかのtex雛形を入れておく必要があります．
 とhikiutils環境を再度初期化すると，自動でインストールする設定です．
 なかったら手動で作ってください．
 !!!!head.tex
+題目，学生番号，氏名を変更する．年月をチェック．
 <<< latex
 bob% cat head.tex
 \title{卒業論文\\
@@ -112,6 +114,8 @@ bob% cat head.tex
 >>>
 
 !!!!pre.tex
+あまり変更しないほうがいいが，いずれいじる．例えば，フォントポイント数を10から12ptに変える，
+\pagestyle{empty}を外すなど．
 <<< latex
 bob% cat pre.tex
 \documentclass[10pt,a4j]{article}

data/hikiutils_bob/latex_dir/hikiutils_bob.log

@@ -1,48 +1,57 @@
-This is e-pTeX, Version 3.14159265-p3.7-160201-2.6 (utf8.euc) (TeX Live 2016) (preloaded format=platex 2017.1.26)  26 JAN 2017 16:25
+This is e-pTeX, Version 3.14159265-p3.7-160201-2.6 (utf8.euc) (TeX Live 2016) (preloaded format=platex 2017.1.26)  28 JAN 2017 17:14
 entering extended mode
  restricted \write18 enabled.
  file:line:error style messages enabled.
  %&-line parsing enabled.
 **hikiutils_bob.tex
 (./hikiutils_bob.tex
-pLaTeX2e <2016/05/07> (based on LaTeX2e <2016/03/31>)
+pLaTeX2e <2016/11/29> (based on LaTeX2e <2017/01/01>)
 Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
 (/usr/local/texlive/2016/texmf-dist/tex/platex/jsclasses/jsarticle.cls
-Document Class: jsarticle 2014/02/07 okumura
-LaTeX Info: Redefining \rmfamily on input line 352.
-LaTeX Info: Redefining \sffamily on input line 355.
-LaTeX Info: Redefining \ttfamily on input line 358.
+Document Class: jsarticle 2017/01/13 okumura, texjporg
+\jsc@mpt=\dimen118
+\jsc@mmm=\dimen119
+\jsc@smallskipamount=\skip41
+LaTeX Info: Redefining \rmfamily on input line 468.
+LaTeX Info: Redefining \sffamily on input line 471.
+LaTeX Info: Redefining \ttfamily on input line 474.
+LaTeX Info: Redefining \textmc on input line 477.
+LaTeX Info: Redefining \textgt on input line 479.
 \symmincho=\mathgroup4
 LaTeX Font Info:    Overwriting symbol font `mincho' in version `bold'
-(Font)                  JY1/mc/m/n --> JY1/gt/m/n on input line 423.
+(Font)                  JY1/mc/m/n --> JY1/gt/m/n on input line 540.
 LaTeX Font Info:    Font shape `JT1/mc/m/n' will be
-(Font)              scaled to size 9.60999pt on input line 613.
+(Font)              scaled to size 9.60999pt on input line 731.
 LaTeX Font Info:    Font shape `JY1/mc/m/n' will be
-(Font)              scaled to size 9.60999pt on input line 613.
-\fullwidth=\dimen118
+(Font)              scaled to size 9.60999pt on input line 731.
+\fullwidth=\dimen120
 LaTeX Font Info:    Font shape `JT1/mc/m/n' will be
-(Font)              scaled to size 7.68799pt on input line 760.
+(Font)              scaled to size 7.68799pt on input line 883.
 LaTeX Font Info:    Font shape `JY1/mc/m/n' will be
-(Font)              scaled to size 7.68799pt on input line 760.
-\c@part=\count81
-\c@section=\count82
-\c@subsection=\count83
-\c@subsubsection=\count84
-\c@paragraph=\count85
-\c@subparagraph=\count86
+(Font)              scaled to size 7.68799pt on input line 883.
+\c@part=\count82
+\c@section=\count83
+\c@subsection=\count84
+\c@subsubsection=\count85
+\c@paragraph=\count86
+\c@subparagraph=\count87
 \@abstractbox=\box41
-\c@figure=\count87
-\c@table=\count88
-\abovecaptionskip=\skip41
-\belowcaptionskip=\skip42
-\js@tocl@width=\dimen119
-\@lnumwidth=\dimen120
-\bibindent=\dimen121
-LaTeX Info: Redefining \TeX on input line 1731.
-LaTeX Info: Redefining \LaTeX on input line 1757.
-LaTeX Info: Redefining \LaTeXe on input line 1782.
-\heisei=\count89
-) (/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/graphicx.sty
+\c@figure=\count88
+\c@table=\count89
+\abovecaptionskip=\skip42
+\belowcaptionskip=\skip43
+\jsc@tocl@width=\dimen121
+\@lnumwidth=\dimen122
+\bibindent=\dimen123
+(/usr/local/texlive/2016/texmf-dist/tex/platex/jsclasses/jslogo.sty
+Package: jslogo 2016/07/14 okumura, texjporg
+LaTeX Info: Redefining \TeX on input line 94.
+LaTeX Info: Redefining \LaTeX on input line 147.
+LaTeX Info: Redefining \LaTeXe on input line 200.
+)
+\heisei=\count90
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/graphicx.sty
 Package: graphicx 2014/10/28 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)
 
 (/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/keyval.sty
@@ -50,58 +59,52 @@ Package: keyval 2014/10/28 v1.15 key=value parser (DPC)
 \KV@toks@=\toks15
 )
 (/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/graphics.sty
-Package: graphics 2016/05/09 v1.0r Standard LaTeX Graphics (DPC,SPQR)
+Package: graphics 2016/10/09 v1.0u Standard LaTeX Graphics (DPC,SPQR)
 
 (/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/trig.sty
 Package: trig 2016/01/03 v1.10 sin cos tan (DPC)
 )
 (/usr/local/texlive/2016/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
-File: graphics.cfg 2016/01/02 v1.10 sample graphics configuration
+File: graphics.cfg 2016/06/04 v1.11 sample graphics configuration
 )
-Package graphics Info: Driver file: dvipdfmx.def on input line 96.
-
-(/usr/local/texlive/2016/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
-File: dvipdfmx.def 2016/04/06 v4.08 LaTeX color/graphics driver for dvipdfmx (T
-eX Live/ChoF)
+Package graphics Info: Driver file: dvipdfmx.def on input line 99.
 
-(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/infwarerr.sty
-Package: infwarerr 2016/05/16 v1.4 Providing info/warning/error messages (HO)
-)
-(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
-Package: ltxcmds 2016/05/16 v1.23 LaTeX kernel commands for general use (HO)
-)))
-\Gin@req@height=\dimen122
-\Gin@req@width=\dimen123
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
+File: dvipdfmx.def 2016/07/11 v4.12 LaTeX color/graphics driver for dvipdfmx (L
+3/ChoF)
+))
+\Gin@req@height=\dimen124
+\Gin@req@width=\dimen125
 )
 (/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/color.sty
-Package: color 2016/05/09 v1.1c Standard LaTeX Color (DPC)
+Package: color 2016/07/10 v1.1e Standard LaTeX Color (DPC)
 
 (/usr/local/texlive/2016/texmf-dist/tex/latex/graphics-cfg/color.cfg
 File: color.cfg 2016/01/02 v1.6 sample color configuration
 )
-Package color Info: Driver file: dvipdfmx.def on input line 144.
+Package color Info: Driver file: dvipdfmx.def on input line 147.
 
 (/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/dvipsnam.def
-File: dvipsnam.def 2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)
+File: dvipsnam.def 2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)
 ))
 (/usr/local/texlive/2016/texmf-dist/tex/latex/listings/listings.sty
-\lst@mode=\count90
+\lst@mode=\count91
 \lst@gtempboxa=\box42
 \lst@token=\toks16
-\lst@length=\count91
-\lst@currlwidth=\dimen124
-\lst@column=\count92
-\lst@pos=\count93
-\lst@lostspace=\dimen125
-\lst@width=\dimen126
-\lst@newlines=\count94
-\lst@lineno=\count95
-\lst@maxwidth=\dimen127
+\lst@length=\count92
+\lst@currlwidth=\dimen126
+\lst@column=\count93
+\lst@pos=\count94
+\lst@lostspace=\dimen127
+\lst@width=\dimen128
+\lst@newlines=\count95
+\lst@lineno=\count96
+\lst@maxwidth=\dimen129
 
 (/usr/local/texlive/2016/texmf-dist/tex/latex/listings/lstmisc.sty
 File: lstmisc.sty 2015/06/04 1.6 (Carsten Heinz)
-\c@lstnumber=\count96
-\lst@skipnumbers=\count97
+\c@lstnumber=\count97
+\lst@skipnumbers=\count98
 \lst@framebox=\box43
 )
 (/usr/local/texlive/2016/texmf-dist/tex/latex/listings/listings.cfg
@@ -114,6 +117,9 @@ Package: listings 2015/06/04 1.6 (Carsten Heinz)
 LaTeX Warning: Label `default' multiply defined.
 
 
+LaTeX Warning: Label `default' multiply defined.
+
+
 LaTeX Warning: Label `default' multiply defined.
 
 ) (./latex_all.aux))
@@ -135,7 +141,7 @@ LaTeX Font Info:    Checking defaults for JY1/mc/m/n on input line 39.
 LaTeX Font Info:    ... okay on input line 39.
 LaTeX Font Info:    Checking defaults for JT1/mc/m/n on input line 39.
 LaTeX Font Info:    ... okay on input line 39.
-\c@lstlisting=\count98
+\c@lstlisting=\count99
 LaTeX Font Info:    Font shape `JT1/mc/m/n' will be
 (Font)              scaled to size 16.60605pt on input line 45.
 LaTeX Font Info:    Font shape `JY1/mc/m/n' will be
@@ -190,59 +196,68 @@ LaTeX Font Info:    Font shape `JT1/mc/m/n' will be
 (Font)              scaled to size 8.64899pt on input line 11.
 LaTeX Font Info:    Font shape `JY1/mc/m/n' will be
 (Font)              scaled to size 8.64899pt on input line 11.
- [3
-
-]
 LaTeX Font Info:    Font shape `JT1/gt/m/n' will be
 (Font)              scaled to size 11.53198pt on input line 16.
 LaTeX Font Info:    Font shape `JY1/gt/m/n' will be
 (Font)              scaled to size 11.53198pt on input line 16.
+ [3
+
+]
 File: ../figs/./hikiutils_bob.003.jpeg Graphic file (type eps)
  <../figs/./hikiutils_bob.003.jpeg>
 LaTeX Font Info:    Font shape `JT1/mc/m/n' will be
 (Font)              scaled to size 6.72699pt on input line 40.
 
 [4] [5] [6]
-LaTeX Font Info:    Try loading font information for OML+cmr on input line 123.
+LaTeX Font Info:    Try loading font information for OML+cmr on input line 129.
 
  (/usr/local/texlive/2016/texmf-dist/tex/latex/base/omlcmr.fd
 File: omlcmr.fd 2014/09/29 v2.5h Standard LaTeX font definitions
 )
 LaTeX Font Info:    Font shape `OML/cmr/m/n' in size <10> not available
-(Font)              Font shape `OML/cmm/m/it' tried instead on input line 123.
-
-[7]) [8]
-\openout2 = `latex_all.aux'.
-
- (./latex_all.tex [9
+(Font)              Font shape `OML/cmm/m/it' tried instead on input line 129.
 
+[7]
+File: ../figs/./hikiutils_bob.004.jpeg Graphic file (type eps)
+ <../figs/./hikiutils_bob.004.jpeg>
+LaTeX Font Info:    Try loading font information for OMS+cmr on input line 181.
 
-]
-LaTeX Font Info:    Try loading font information for OMS+cmr on input line 56.
 
 (/usr/local/texlive/2016/texmf-dist/tex/latex/base/omscmr.fd
 File: omscmr.fd 2014/09/29 v2.5h Standard LaTeX font definitions
 )
 LaTeX Font Info:    Font shape `OMS/cmr/m/n' in size <10> not available
-(Font)              Font shape `OMS/cmsy/m/n' tried instead on input line 56.
- [10]
-Overfull \hbox (123.96475pt too wide) in paragraph at lines 102--103
+(Font)              Font shape `OMS/cmsy/m/n' tried instead on input line 181.
+ [8] [9]
+Overfull \hbox (24.60419pt too wide) in paragraph at lines 203--204
+[]\OT1/cmtt/m/n/10 convert #{source} -resize 20% #{target}\JY1/gt/m/n/10 によ 
+って ， \OT1/cmtt/m/n/10 target=figs/TAERGET.png
+ []
+
+) [10]
+\openout2 = `latex_all.aux'.
+
+ (./latex_all.tex [11
+
+
+] [12]
+Overfull \hbox (71.46521pt too wide) in paragraph at lines 105--106
 []\JY1/mc/m/n/10 うまくできないときは\JY1/gt/m/n/10 ここ \OT1/cmtt/m/n/10 (http
-://qiita.com/hideaki_polisci/items/3afd204449c6cdd995c9#51-texshop
+://qiita.com/hideaki_polisci/items/3afd204449c6cdd995c9)
  []
 
-[11] [12]) [13] (./hikiutils_bob.aux (./sync.aux) (./latex_all.aux))
+[13] [14]) [15] (./hikiutils_bob.aux (./sync.aux) (./latex_all.aux))
 
 LaTeX Warning: There were multiply-defined labels.
 
  ) 
 Here is how much of TeX's memory you used:
- 2391 strings out of 493693
- 33442 string characters out of 6149787
- 150565 words of memory out of 5000000
- 5944 multiletter control sequences out of 15000+600000
+ 2278 strings out of 493683
+ 31685 string characters out of 6149653
+ 139508 words of memory out of 5000000
+ 5844 multiletter control sequences out of 15000+600000
  15224 words of font info for 69 fonts, out of 8000000 for 9000
  934 hyphenation exceptions out of 8191
- 29i,9n,35p,735b,1563s stack positions out of 5000i,500n,10000p,200000b,80000s
+ 29i,9n,35p,749b,1567s stack positions out of 5000i,500n,10000p,200000b,80000s
 
-Output written on hikiutils_bob.dvi (13 pages, 35768 bytes).
+Output written on hikiutils_bob.dvi (15 pages, 41584 bytes).