hikiutils 0.2.3.12 → 0.2.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a3407c3f768b2e1b46dd533be0cf2abd6707be
-  data.tar.gz: 9cb4306e6aeadb395e53cd2fad88af3603ca312a
+  metadata.gz: 2bf7e048b1569915303318d0b3b865e55753a422
+  data.tar.gz: 22c3c6e74a468ad1a53f70c06f2c845ea4b06e7a
 SHA512:
-  metadata.gz: 18bf3738cd6bdda20de6c961b9ee0bb9413e83b097a82b9885a6b2943fdbc91d11248e0ea5db2834a1b427b94fd7a3ef8cb1913e9f649ad2a9ccd8df4fbfc46a
-  data.tar.gz: 6ec1f8567f1c2a1e7fb5b8e1ddeeebfbe426803ad1cb70d1bc77bfb6af5b3eb879284c6dd5d68f1e38660ed45a66aecea6d075bbcab251f3edb7b2cac13d2756
+  metadata.gz: 5417c0e72a9e427af8b888ab1eda43a652f2d109bf12bf5f40206faba5472015ab89475c4685a53de695cfbde3042c632207a024383e002e0296a1164ce27f42
+  data.tar.gz: 10ba14e9fb5a05f95be423761a826ae7a665c06346bf60b9f599a0dbd6a96256c1ec7a22801ca0c16fe1ea39699b75d0e8667893299a8d1ab3685094417dec25

data/hikiutils_bob/Rakefile

@@ -36,7 +36,7 @@ task :reset_hiki do
   }
   r_files = files.reverse[0..-4]
   r_files.each{|file|
-    print "remove #{file}[ynqlA]? ".red
+    print "remove #{file}? [ynqlA]  ".red
     input=STDIN.gets.chomp
     case input
     when 'y'
@@ -49,7 +49,7 @@ task :reset_hiki do
     when 'q'
       exit
     when 'A'
-      print "\nAre you sure[Yn]? ".magenta
+      print "\nAre you sure? [Yn]  ".magenta
       input2 = STDIN.gets.chomp
       case input2
         when 'Y'
@@ -189,6 +189,7 @@ end
 
 desc "すべてのhikiファイルをlatex変換"
 task :latex_all do
+  check_bounding_box
   p entries=Dir.entries('.')
   main_file = latex_loop(entries,opts={:main=>true})
   latex_loop(entries)

data/hikiutils_yamane/Rakefile

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 require 'systemu'
 require 'tempfile'
+require 'colorize'
 # -*- coding: utf-8 -*-
 begin
-  target_dir = File.readlines('./.hikirc')[0].chomp
+  $hiki_dir = File.readlines('./.hikirc')[0].chomp
 rescue => e
   puts e
   exit
@@ -20,10 +21,48 @@ 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
 
+desc "hikiシステムにあるゴミファイルを掃除する"
+task :reset_hiki do
+  status, stdout, stderr = systemu "hiki -l #{$basename}"
+  print stdout
+  files=[]
+  stdout.split("\n").each{|line|
+    files << line.split(/\s+/)[-1]
+  }
+  r_files = files.reverse[0..-4]
+  r_files.each{|file|
+    print "remove #{file}[ynqlA]? ".red
+    input=STDIN.gets.chomp
+    case input
+    when 'y'
+      p command="hiki --remove #{file}"
+      system command
+    when 'n'
+    when 'l'
+      p command="hiki -l #{$basename}"
+      system command
+    when 'q'
+      exit
+    when 'A'
+      print "\nAre you sure[Yn]? ".magenta
+      input2 = STDIN.gets.chomp
+      case input2
+        when 'Y'
+        r_files.each{|file| system "hiki --remove #{file}"}
+        p target = File.join($hiki_dir,'cache','attach',$basename)
+        exit
+        when 'n'
+        exit
+      end
+    end
+  }
+end
+
 desc "latex_dirのゴミを掃除"
 task :reset_latex_dir do
   system "mv latex_dir/head.tex ."
@@ -41,14 +80,10 @@ task :mk_toc do
     if m=line.match(/\\contentsline \{(.+)\}\{\\numberline \{([\d|\.]+)\}(.+)\}\{\d+\}/)
       layer,sec_no,title=m[1],m[2],m[3]
       d = case m[1]
-          when 'section'
-            1
-          when 'subsection'
-            2
-          when 'subsubsection'
-            3
-          else
-            4
+          when 'section'; 1
+          when 'subsection'; 2
+          when 'subsubsection'; 3
+          else; 4
           end
       layer = "!"*d
       title.gsub!('\_','_')
@@ -59,16 +94,39 @@ task :mk_toc do
   File.open("toc.hiki",'w'){|file| file.print cont}
 end
 
-desc "hikiシステムを最新状態に更新"
+desc "FILE.hikiあるいはhikiファイルすべてを最新状態に更新"
 task :touch do
-  Dir.entries('.').each{|file|
+  if file=ARGV[1] 
     file_split=file.split(".")
-    if file_split[1]=='hiki'
-      next if file_split[0]==$basename
-      p target = $basename+"_"+file_split[0]
-      system "hiki -u #{target}"
-    end
-  }
+    p target = $basename==file_split[0] ? $basename : $basename+"_"+file_split[0]
+    system "hiki -u #{target}"
+  else
+    p target = File.join($hiki_dir,'cache','attach',$basename)
+    system "touch #{target}/*"
+    Dir.entries('.').each{|file|
+      file_split=file.split(".")
+      if file_split[1]=='hiki'
+        p target = $basename==file_split[0] ? $basename : $basename+"_"+file_split[0]
+        system "hiki -u #{target}"
+      end
+    }
+  end
+  exit
+end
+
+desc "FILE.hikiあるいはhikiファイルをedtiorで開く"
+task :open do
+  if file=ARGV[1] 
+    system "open -a mi #{file}"
+  else
+    Dir.entries('.').each{|file|
+      file_split=file.split(".")
+      if file_split[1]=='hiki'
+        p target = file_split[0]
+        system "open -a mi #{target}"
+      end
+    }
+  end
 end
 
 desc "FILE1をlatexに変換"
@@ -82,6 +140,7 @@ task :latex_wrap => [:latex_base, :change_wrap] do
 end
 
 def latex_loop(entries,opts={})
+  check_bounding_box
   main_file=""
   entries.each{|file|
     options={:latex_all=>true}
@@ -120,6 +179,11 @@ def check_section_layers(lines)
   p $section_layer
 end
 
+def check_bounding_box
+#  $bounding_box="0 0 442 432"
+  $bounding_box=" 0 0 737 553"
+end
+
 desc "すべてのhikiファイルをlatex変換"
 task :latex_all do
   p entries=Dir.entries('.')
@@ -129,12 +193,15 @@ task :latex_all do
   p reg_exp = Regexp.new("#{$basename}_(.+)")
   toc = false
   File.readlines(File.join($latex_dir,"#{main_file}.tex")).each{|line|
-    if line.match(/\\tableofcontents/) 
-      p line
-      line = "" if toc== true 
-      toc = true if toc == false
+#    line, toc = "", true if line.match(/\\tableofcontents/) and toc == true #only one
+    if line.match(/\\tableofcontents/)
+      if toc == false #only one
+        toc = true 
+      else
+        line = ''
+      end
     end
-
+    line ="\\usepackage{listings,jlisting}" if line.match(/\\usepackage{listings}/)
     if line.match(/section{(.+)}/)
       if m=line.match(/\\verb\|(.+)\((.+)\)\|/)
         p m
@@ -156,6 +223,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}")
@@ -183,10 +251,27 @@ 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=6cm,bb=0 0 442 432\]\{../figs/#{m[1]}\}\n"
+      p line="\\includegraphics\[width=10cm,bb=#{$bounding_box}\]\{../figs/#{m[1]}\}\n"
       cont << line
     else
       cont << line
@@ -195,6 +280,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)
 
@@ -283,6 +380,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
@@ -290,11 +407,12 @@ task :sync0 do
     next if source.include?('.hikirc')
     p base = source.split('.')[0]
     name = (base==$basename)? base : $basename+'_'+base
-    p target = File.join(target_dir,'text',name)
+    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
-  p target = File.join(target_dir,'cache','attach',$basename)
+  p target = File.join($hiki_dir,'cache','attach',$basename)
   FileUtils.mkdir_p(target,:verbose=>true) unless File.exists?(target)
   entries[2..-1].each{|file|
     p source = File.join('./figs',file)
@@ -303,7 +421,7 @@ task :sync0 do
 
   File.open('./.hikirc','w'){|file|
     status, stdout, stderr =systemu "hiki -l #{$basename}*"
-    file.print(target_dir+"\n")
+    file.print($hiki_dir+"\n")
     stdout.split("\n")[3..-1].each{|line|
       file.print line+"\n"
     }
@@ -314,8 +432,8 @@ end
 desc "For hiki Errno::ENOENT, Errno::EACCES"
 task :chenv do
   p user = ENV['USER']
-  system("sudo chmod -R a+w #{target_dir}")
-#  system("sudo chown -R #{user} #{target_dir}")
+  system("sudo chmod -R a+w #{$hiki_dir}")
+#  system("sudo chown -R #{user} #{$hiki_dir}")
 end
 
 desc "self copy to hikiutils template directory"