hikiutils 0.2.3.11 → 0.2.3.12

data/lib/templates/Rakefile_hiki_sync

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'systemu'
 require 'tempfile'
+require 'colorize'
 # -*- coding: utf-8 -*-
 begin
   $hiki_dir = File.readlines('./.hikirc')[0].chomp
@@ -20,7 +21,8 @@ end
 desc "Githubのdirをsafariでopen"
 task :github do
   status, stdout, stderr = systemu %q( git remote -v |grep origin )
-  p github_dir=stdout.match(/(.+):(.+) \(push\)/)[2]
+  github_dir=stdout.match(/(.+):(.+) \(push\)/)[2]
+  puts github_dir.blue
   system "open https://github.com/#{github_dir}"
 end
 
@@ -32,9 +34,9 @@ task :reset_hiki do
   stdout.split("\n").each{|line|
     files << line.split(/\s+/)[-1]
   }
-  p r_files = files.reverse[0..-4]
+  r_files = files.reverse[0..-4]
   r_files.each{|file|
-    print "remove #{file}[ynqlA]?"
+    print "remove #{file}[ynqlA]? ".red
     input=STDIN.gets.chomp
     case input
     when 'y'
@@ -47,7 +49,7 @@ task :reset_hiki do
     when 'q'
       exit
     when 'A'
-      print "\nAre you sure?[Yn]"
+      print "\nAre you sure[Yn]? ".magenta
       input2 = STDIN.gets.chomp
       case input2
         when 'Y'
@@ -108,11 +110,12 @@ task :touch do
       file_split=file.split(".")
       if file_split[1]=='hiki'
         next if file_split[0]==$basename
-        p target = $basename+"_"+file_split[0]
+        p target = $basename==file_split[0] ? $basename : $basename+"_"+file_split[0]
         system "hiki -u #{target}"
       end
     }
   end
+  exit
 end
 
 desc "FILE.hikiあるいはhikiファイルをedtiorで開く"
@@ -181,13 +184,12 @@ end
 
 def check_bounding_box
 #  $bounding_box="0 0 442 432"
-  $bounding_box=" 0 0 737 453"
+  $bounding_box=" 0 0 737 553"
 end
 
 desc "すべてのhikiファイルをlatex変換"
 task :latex_all do
   p entries=Dir.entries('.')
-  check_bounding_box
   main_file = latex_loop(entries,opts={:main=>true})
   latex_loop(entries)
   cont=""
@@ -217,6 +219,7 @@ task :latex_all do
 end
 
 task :latex_base do
+  check_bounding_box
   Dir.mkdir($latex_dir) unless Dir.exist?($latex_dir)
   convert_to_latex(ARGV[1])
   system("open #{$save_name}")
@@ -244,8 +247,25 @@ def convert_to_latex(file_name, options={})
   system "hiki2latex #{pre_command} #{options[:latex]} #{tf1} > #{tf2}"
   lines = File.readlines(tf2)
   system "rm #{tf1} #{tf2}"
-  cont = ""
+  in_bib,cont=false,""
   lines.each{|line|
+    line=latex_cite_ref(line)
+    if m=line.match(/\\caption{\s*\((.+?)\)(.+)}/)
+      p m
+      puts line = "\\caption{#{m[2]}}\n\\label{#{m[1]}}\n"
+    end
+    if m=line.match(/\\section{reference:}(.+)/) and in_bib==false
+      in_bib=true
+      line = "\\begin{thebibliography}{99}\n"
+      puts line.blue
+    end
+    if m=line.match(/\\end{description}/) and in_bib==true
+      in_bib=false
+      line = "\\end{thebibliography}\n"
+    end
+    if m=line.match(/\\item\[(.+)\](.+)/) and in_bib==true
+      line ="\\bibitem{#{m[1]}} #{m[2]}"
+    end
     if m=line.match(/\\includegraphics\[width=6cm\]\{(.+)\}/)
       p line="\\includegraphics\[width=10cm,bb=#{$bounding_box}\]\{../figs/#{m[1]}\}\n"
       cont << line
@@ -256,6 +276,18 @@ def convert_to_latex(file_name, options={})
   File.open($save_name,'w'){|file| file.print cont }
 end
 
+def latex_cite_ref(line)
+  r_pair=[/\\verb\|{{cite\((.+?)\)}}\|/,/\\verb\|{{ref\((.+?)\)}}\|/]
+  while m=line.match(r_pair[0])
+    line.sub!(r_pair[0],"\\cite\{#{m[1]}\}")
+  end
+  while m=line.match(r_pair[1])
+    line.sub!(r_pair[1],"\\ref\{#{m[1]}\}")
+  end
+  puts line.chomp.blue
+  return line
+end
+
 task :change_wrap do
   lines = File.readlines($save_name)
 
@@ -344,6 +376,26 @@ task :sync => [:check_previous,:sync0]
 desc "hikiの強制同期"
 task :force_sync => [:sync0]
 
+def hiki_cite_ref(file)
+  tf1 = 'tmp1.txt'
+  lines = File.readlines(file)
+  inside_pre_form,cont = false,""
+  lines.each{|line|
+    inside_pre_form=true if line.match(/^<<</) and !inside_pre_form
+    inside_pre_form=false if line.match(/^>>>/) and inside_pre_form
+    tr_pair=[/\{\{cite\((.+?)\)\}\}/,/\{\{ref\((.+)\)\}\}/]
+    while m=line.match(tr_pair[0]) and !inside_pre_form
+      puts line.sub!(tr_pair[0], "\[[[#{m[1]}|#{$basename}_references]]\]").chomp.green
+    end
+    while m=line.match(tr_pair[1]) and !inside_pre_form
+      puts line.sub!(tr_pair[1],"#{m[1]}").chomp.green
+    end
+    cont << line
+  }
+  File.open(tf1,'w'){|file| file.print cont }
+  return tf1
+end
+
 task :sync0 do
   entries=Dir.entries('.')
   entries[2..-1].each{|source| #cp *.hiki
@@ -352,6 +404,7 @@ task :sync0 do
     p base = source.split('.')[0]
     name = (base==$basename)? base : $basename+'_'+base
     p target = File.join($hiki_dir,'text',name)
+    source = hiki_cite_ref(source)
     FileUtils.cp(source,target,:verbose=>true)
   }
   p entries=Dir.entries('./figs') #cp files in figs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hikiutils
 version: !ruby/object:Gem::Version
-  version: 0.2.3.11
+  version: 0.2.3.12
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "."
 email:
 - shigeto_nishitani@me.com
@@ -300,9 +314,9 @@ files:
 - hikiutils.wiki/README.md
 - hikiutils.wiki/README_ja.md
 - hikiutils.wiki/yamane.md
-- hikiutils_bob/.#Rakefile
 - hikiutils_bob/.gitignore
 - hikiutils_bob/Rakefile
+- hikiutils_bob/code.hiki
 - hikiutils_bob/figs/calphad_bob.pdf
 - hikiutils_bob/figs/hikiutils_bob.001.bb
 - hikiutils_bob/figs/hikiutils_bob.001.jpeg
@@ -311,6 +325,7 @@ files:
 - hikiutils_bob/figs/hikiutils_bob.003.jpeg
 - hikiutils_bob/figs/hikiutils_bob.004.jpeg
 - hikiutils_bob/figs/hikiutils_bob.005.jpeg
+- hikiutils_bob/figs/hikiutils_bob.006.jpeg
 - hikiutils_bob/figs/hikiutils_bob.pdf
 - hikiutils_bob/figs/sync.pdf
 - hikiutils_bob/hiki_help.yml
@@ -318,30 +333,33 @@ files:
 - hikiutils_bob/hikiutils_bob.hiki
 - hikiutils_bob/hikiutils_bob.key
 - hikiutils_bob/hikiutils_bob/hikiutils_bob.001.jpeg
-- hikiutils_bob/hikiutils_bob/hikiutils_bob.002.bb
 - hikiutils_bob/hikiutils_bob/hikiutils_bob.002.jpeg
 - hikiutils_bob/hikiutils_bob/hikiutils_bob.003.jpeg
 - hikiutils_bob/hikiutils_bob/hikiutils_bob.004.jpeg
 - hikiutils_bob/hikiutils_bob/hikiutils_bob.005.jpeg
-- hikiutils_bob/latex2hiki.hiki
+- hikiutils_bob/hikiutils_bob/hikiutils_bob.006.jpeg
 - hikiutils_bob/latex_all.hiki
+- hikiutils_bob/latex_dir/code.aux
+- hikiutils_bob/latex_dir/code.tex
 - hikiutils_bob/latex_dir/head.tex
 - hikiutils_bob/latex_dir/hikiutils_bob.aux
 - hikiutils_bob/latex_dir/hikiutils_bob.log
 - hikiutils_bob/latex_dir/hikiutils_bob.pdf
-- hikiutils_bob/latex_dir/hikiutils_bob.synctex.gz
 - hikiutils_bob/latex_dir/hikiutils_bob.tex
 - hikiutils_bob/latex_dir/hikiutils_bob.toc
 - hikiutils_bob/latex_dir/jlisting.sty
+- hikiutils_bob/latex_dir/jlisting.tex
 - hikiutils_bob/latex_dir/latex2hiki.aux
 - hikiutils_bob/latex_dir/latex2hiki.tex
 - hikiutils_bob/latex_dir/latex_all.aux
 - hikiutils_bob/latex_dir/latex_all.tex
 - hikiutils_bob/latex_dir/pre.tex
+- hikiutils_bob/latex_dir/references.tex
 - hikiutils_bob/latex_dir/sync.aux
-- hikiutils_bob/latex_dir/sync.log
 - hikiutils_bob/latex_dir/sync.tex
+- hikiutils_bob/references.hiki
 - hikiutils_bob/sync.hiki
+- hikiutils_bob/tmp1.txt
 - hikiutils_bob/toc.hiki
 - hikiutils_yamane/.gitignore
 - hikiutils_yamane/Rakefile

data/hikiutils_bob/.#Rakefile

@@ -1 +0,0 @@
-bob@bob.local.81065

data/hikiutils_bob/hikiutils_bob/hikiutils_bob.002.bb

@@ -1,5 +0,0 @@
-%%Title: hikiutils_bob.002.jpeg
-%%Creator: extractbb 20160307
-%%BoundingBox: 0 0 737 553
-%%CreationDate: Mon Feb  6 21:52:49 2017
-

data/hikiutils_bob/latex2hiki.hiki

@@ -1,25 +0,0 @@
-!latexからhikiへの変換
-!!rake mk_toc
-latexが作成するtableofcontentsの実態であるtocファイルからhiki用のtoc.hikiを作成する．
-
-!!listings
-<<< latex
-\lstset{
-  basicstyle={\ttfamily\scriptsize},
-  identifierstyle={\scriptsize},
-  commentstyle={\scriptsize\itshape\color{red}},
-  keywordstyle={\scriptsize\bfseries\color{cyan}},
-  ndkeywordstyle={\scriptsize},
-  stringstyle={\scriptsize\color{blue}},
-  frame={tb},
-  breaklines=true,
-  numbers=left,
-  numberstyle={\footnotesize},
-  stepnumber=1,
-  numbersep=1zw,
-  xrightmargin=0zw,
-  xleftmargin=3zw,
-  lineskip=-0.5ex
-}
->>>
-

data/hikiutils_bob/latex_dir/sync.log

@@ -1,28 +0,0 @@
-This is e-pTeX, Version 3.14159265-p3.7-160201-2.6 (utf8.euc) (TeX Live 2016) (preloaded format=platex 2017.1.26)  6 FEB 2017 09:51
-entering extended mode
- restricted \write18 enabled.
- file:line:error style messages enabled.
- %&-line parsing enabled.
-**sync.tex
-(./sync.tex
-pLaTeX2e <2016/11/29> (based on LaTeX2e <2017/01/01>)
-Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
-./sync.tex:2: Undefined control sequence.
-l.2 \section
-            {イントロダクション}
-? 
-./sync.tex:2: Emergency stop.
-l.2 \section
-            {イントロダクション}
-End of file on the terminal!
-
- 
-Here is how much of TeX's memory you used:
- 4 strings out of 493683
- 30 string characters out of 6149653
- 53892 words of memory out of 5000000
- 3671 multiletter control sequences out of 15000+600000
- 7511 words of font info for 31 fonts, out of 8000000 for 9000
- 929 hyphenation exceptions out of 8191
- 5i,0n,3p,39b,8s stack positions out of 5000i,500n,10000p,200000b,80000s
-No pages of output.