hikiutils 0.2.3.17 → 0.2.4

data/lib/templates/Rakefile_hiki_sync

@@ -1,22 +1,24 @@
 # -*- coding: utf-8 -*-
-
-# -*- coding: utf-8 -*-
+# this is supplied by hiki_optparse --initialize
+# hikiutils are synchronizing system between local dir and hiki
+# and also supplied hiki_dir with latex_dir
+#    cc by Shigeto R. Nishitani, 2017
 require 'systemu'
 require 'tempfile'
 require 'colorize'
 require 'coderay'
 
-# -*- coding: utf-8 -*-
 begin
   $hiki_dir = File.readlines('./.hikirc')[0].chomp
 rescue => e
   puts e
   exit
 end
-dirnames=Dir.pwd.split('/')
-$basename = (dirnames[-1]=='hikis')? dirnames[-2] : dirnames[-1]
+p dirnames=Dir.pwd.split('/')
+p $basename = (dirnames[-1]=='hikis')? dirnames[-2] : dirnames[-1]
 $latex_dir= 'latex_dir'
 $section_layer = {}
+p $target_dir = ARGV[1] || '.'
 
 task :default do
   system 'rake -T'
@@ -32,7 +34,7 @@ end
 
 desc "hikiシステムにあるゴミファイルを掃除する"
 task :reset_hiki do
-  status, stdout, stderr = systemu "hiki -l #{$basename}"
+  status, stdout, stderr = systemu "hiki ls #{$basename}"
   print stdout
   files=[]
   stdout.split("\n").each{|line|
@@ -44,11 +46,11 @@ task :reset_hiki do
     input=STDIN.gets.chomp
     case input
     when 'y'
-      p command="hiki --remove #{file}"
+      p command="hiki rm #{file}"
       system command
     when 'n'
     when 'l'
-      p command="hiki -l #{$basename}"
+      p command="hiki ls #{$basename}"
       system command
     when 'q'
       exit
@@ -57,7 +59,7 @@ task :reset_hiki do
       input2 = STDIN.gets.chomp
       case input2
         when 'Y'
-        r_files.each{|file| system "hiki --remove #{file}"}
+        r_files.each{|file| system "hiki rm #{file}"}
         p target = File.join($hiki_dir,'cache','attach',$basename)
         exit
         when 'n'
@@ -67,17 +69,6 @@ task :reset_hiki do
   }
 end
 
-desc "latex_dirのゴミを掃除"
-task :reset_latex_dir do
-  system "mv latex_dir/head.tex ."
-  system "mv latex_dir/jlisting.sty ."
-  system "rm -rf latex_dir"
-  system "mkdir latex_dir"
-  system "mv head.tex latex_dir/"
-  system "mv jlisting.sty latex_dir/"
-  system "rake latex_all"
-end
-
 desc "toc.hikiの作成"
 task :mk_toc do
   p target = $basename+'.toc'
@@ -102,18 +93,27 @@ end
 
 desc "FILE.hikiあるいはhikiファイルすべてを最新状態に更新"
 task :touch do
-  if file=ARGV[1] 
+  name=ARGV[1]||'.'
+  if File.exist?(File.join(name,$basename+'.hiki')) then
+    $target_dir = name
+  else
+    p file = File.basename(name)
+  end
+
+  if file
     file_split=file.split(".")
     p target = $basename==file_split[0] ? $basename : $basename+"_"+file_split[0]
-    system "hiki -u #{target}"
+    system "hiki touch #{target}"
   else
     p target = File.join($hiki_dir,'cache','attach',$basename)
     system "touch #{target}/*"
-    Dir.entries('.').each{|file|
+    Dir.entries($target_dir).each{|file|
+      puts file.red
       file_split=file.split(".")
       if file_split[1]=='hiki'
         p target = $basename==file_split[0] ? $basename : $basename+"_"+file_split[0]
-        system "hiki -u #{target}"
+        p command= "hiki touch #{target}"
+        system command
       end
     }
   end
@@ -122,14 +122,20 @@ end
 
 desc "FILE.hikiあるいはhikiファイルをedtiorで開く"
 task :open do
-  if file=ARGV[1]
+  name=ARGV[1]||'.'
+  if File.exist?(File.join(name,$basename+'.hiki')) then
+    $target_dir = name
+  else
+    p file = name
+  end
+  if file
     file += '.hiki' if file.split(".")[1]==nil
     system "open -a mi #{file}"
   else
-    Dir.entries('.').each{|file|
+    Dir.entries($target_dir).each{|file|
       file_split=file.split(".")
       if file_split[1]=='hiki'
-        p target = file_split[0]
+        p target = File.join($target_dir,file)
         system "open -a mi #{target}"
       end
     }
@@ -151,9 +157,11 @@ def latex_loop(entries,opts={})
   main_file=""
   entries.each{|file|
     options={:latex_all=>true}
-    next unless file.split('.')[1]=='hiki'
-    next if file=='toc.hiki'
-    next if file.include?('.hikirc')
+    file_basename= File.basename(file)
+    next unless file_basename.split('.')[1]=='hiki'
+    next if file_basename=='toc.hiki'
+    next if file_basename.include?('.hikirc')
+    puts file.red
     f_name =File.basename(file,'.hiki')
     if opts[:main]
       if f_name==$basename
@@ -188,15 +196,22 @@ end
 
 def check_bounding_box
 #  $bounding_box="0 0 442 432"
-#  $bounding_box=" 0 0 737 553"
-#  $fig_width="10"
-  $bounding_box=" 0 0 937 753"
-  $fig_width="12"
+#  $bounding_box=" 0 0 737 553" # for 60% converted
+  $fig_width="12" #for wrap figure
+  $bounding_box=" 0 0 937 753" # for original keynote output
+#  $fig_width="12" # for full size width
 end
 
-desc "すべてのhikiファイルをlatex変換"
+def get_target_entries
+  p entries=Dir.entries($target_dir)
+  entries.map!{|file| File.join($target_dir, file)}
+  puts entries.to_s.red
+  return entries
+end
+
+desc "すべてのDIR/hikiファイルをlatex変換"
 task :latex_all do
-  p entries=Dir.entries('.')
+  entries = get_target_entries
   main_file = latex_loop(entries,opts={:main=>true})
   latex_loop(entries)
   cont=""
@@ -245,6 +260,8 @@ def convert_to_latex(file_name, options={})
   p $save_name = ARGV[2] || File.join($latex_dir,tex_name)
   pre_name = File.join($latex_dir,'pre.tex')
   p pre_command = File.exist?(pre_name) ? '--pre '+pre_name : nil
+  p pre_command = ''
+
   lines = File.readlines(file_name)
   check_section_layers(lines) if options[:main]
   cont = ""
@@ -258,10 +275,11 @@ def convert_to_latex(file_name, options={})
   }
   tf1,tf2='tmp1.txt','tmp2.txt'
   File.open(tf1,'w'){|file| file.print cont}
+  options[:latex]="--head latex_dir/head.tex -p "
   system "hiki2latex #{pre_command} #{options[:latex]} #{tf1} > #{tf2}"
   lines = File.readlines(tf2)
   system "rm #{tf1} #{tf2}"
-  in_bib,cont=false,""
+  in_bib,in_abst,cont=false,false,""
   lines.each{|line|
     line=latex_cite_ref(line)
     if m=line.match(/\\caption{\s*\((.+?)\)(.+)}/)
@@ -277,11 +295,21 @@ def convert_to_latex(file_name, options={})
       in_bib=false
       line = "\\end{thebibliography}\n"
     end
-    if m=line.match(/\\item\[(.+)\](.+)/) and in_bib==true
+    if m=line.match(/\\item\[(.+?)\](.+)/) and in_bib==true
       tmp = m[2].gsub!(/\\verb\|(.*?)\|/){ "\\url{#{$1}}" } || m[2]
+      tmp = m[2].gsub!(/\\verb\|(.*?)\|/){ "" } || m[2]
       line ="\\bibitem{#{m[1]}} #{tmp}"
       puts line.blue
     end
+    if m=line.match(/\\section{abstract:}/) and in_abst==false
+      in_abst=true
+      line = "\\begin{abstract}\n"
+      puts line.blue
+    end
+    if m=line.match(/\\section/) and in_abst==true
+      in_abst=false
+      line = "\\end{abstract}\n\n#{line}\n"
+    end
     if m=line.match(/\\includegraphics\[width=6cm\]\{(.+)\}/)
       p line="\\includegraphics\[width=#{$fig_width}cm,bb=#{$bounding_box}\]\{../figs/#{m[1]}\}\n"
       cont << line
@@ -392,7 +420,7 @@ task :sync => [:check_previous,:sync0]
 desc "hikiの強制同期"
 task :force_sync => [:sync0]
 
-def hiki_cite_ref(file)
+def hiki_cite_ref(file) #hiki cittations
   tf1 = 'tmp1.txt'
   lines = File.readlines(file)
   inside_pre_form,cont = false,""
@@ -413,26 +441,35 @@ def hiki_cite_ref(file)
 end
 
 task :sync0 do
-  entries=Dir.entries('.')
-  entries[2..-1].each{|source| #cp *.hiki
-    next unless source.split('.')[1]=='hiki'
-    next if source.include?('.hikirc')
-    p base = source.split('.')[0]
-    name = (base==$basename)? base : $basename+'_'+base
+  entries=get_target_entries
+  entries.each{|file| #cp *.hiki
+    file_basename= File.basename(file)
+    next unless file_basename.split('.')[1]=='hiki'
+    next if file_basename.include?('.hikirc')
+    f_name =File.basename(file,'.hiki')
+    puts f_name.red
+    name = (f_name==$basename)? f_name : $basename+'_'+f_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($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)
+    source = hiki_cite_ref(file)
     FileUtils.cp(source,target,:verbose=>true)
   }
 
+  source_dirs=['./figs','./refs']
+  source_dirs.each{|source_dir|
+    next unless Dir.exist?(source_dir)
+    p entries=Dir.entries(source_dir) #cp files in figs
+    p name = $basename+'_'+File.basename(source_dir)
+    p target = File.join($hiki_dir,'cache','attach',name)
+    FileUtils.mkdir_p(target,:verbose=>true) unless File.exists?(target)
+    entries[2..-1].each{|file|
+      next if FileTest.directory?(File.join(source_dir,file))
+      source = File.join(source_dir,file)
+#      FileUtils.cp(source,target,:verbose=>true)
+      FileUtils.cp(source,target)
+    }
+  }
   File.open('./.hikirc','w'){|file|
-    status, stdout, stderr =systemu "hiki -l #{$basename}*"
+    status, stdout, stderr =systemu "hiki ls #{$basename}"
     file.print($hiki_dir+"\n")
     stdout.split("\n")[3..-1].each{|line|
       file.print line+"\n"
@@ -451,6 +488,7 @@ end
 desc "self copy to hikiutils template directory"
 task :self_copy do
   p cp_files=[[File.join(Dir.pwd,'Rakefile'),'Rakefile_hiki_sync'],
+              [File.join(Dir.pwd,'Rakefile'),'Rakefile_hiki_sync_new'],
             [File.join(ENV['HOME'],'.my_help','hiki_help.yml'),'hiki_help.yml']]
   cp_files.each{|files|
     p source = files[0]
@@ -459,7 +497,7 @@ task :self_copy do
     status, stdout, stderr=systemu command
     if stdout!=''
       puts command.red
-      puts CodeRay.scan(stdout, :Diff).term  
+      puts CodeRay.scan(stdout, :Diff).term
       print " Are you sure to save #{source}? [Yn]  ".red
       FileUtils.cp(source,target,:verbose=>true) if STDIN.gets.chomp=='Y'
     end
@@ -469,7 +507,9 @@ end
 task :check_previous do
   current={}
   print "current hiki dir\n"
-  status, stdout, stderr = systemu("hiki -l #{$basename}*")
+  
+  status, stdout, stderr = systemu("hiki ls #{$basename}")
+  p stdout
   stdout.split("\n")[3..-1].each{|line|
     p line
     file=   line.split(/\s+/)[-1]

data/{hikiutils_yamane/Rakefile → lib/templates/Rakefile_hiki_sync_new}

@@ -1,22 +1,24 @@
 # -*- coding: utf-8 -*-
-
-# -*- coding: utf-8 -*-
+# this is supplied by hiki_optparse --initialize
+# hikiutils are synchronizing system between local dir and hiki
+# and also supplied hiki_dir with latex_dir
+#    cc by Shigeto R. Nishitani, 2017
 require 'systemu'
 require 'tempfile'
 require 'colorize'
 require 'coderay'
 
-# -*- coding: utf-8 -*-
 begin
   $hiki_dir = File.readlines('./.hikirc')[0].chomp
 rescue => e
   puts e
   exit
 end
-dirnames=Dir.pwd.split('/')
-$basename = (dirnames[-1]=='hikis')? dirnames[-2] : dirnames[-1]
+p dirnames=Dir.pwd.split('/')
+p $basename = (dirnames[-1]=='hikis')? dirnames[-2] : dirnames[-1]
 $latex_dir= 'latex_dir'
 $section_layer = {}
+p $target_dir = ARGV[1] || '.'
 
 task :default do
   system 'rake -T'
@@ -32,7 +34,7 @@ end
 
 desc "hikiシステムにあるゴミファイルを掃除する"
 task :reset_hiki do
-  status, stdout, stderr = systemu "hiki -l #{$basename}"
+  status, stdout, stderr = systemu "hiki ls #{$basename}"
   print stdout
   files=[]
   stdout.split("\n").each{|line|
@@ -44,11 +46,11 @@ task :reset_hiki do
     input=STDIN.gets.chomp
     case input
     when 'y'
-      p command="hiki --remove #{file}"
+      p command="hiki rm #{file}"
       system command
     when 'n'
     when 'l'
-      p command="hiki -l #{$basename}"
+      p command="hiki ls #{$basename}"
       system command
     when 'q'
       exit
@@ -57,7 +59,7 @@ task :reset_hiki do
       input2 = STDIN.gets.chomp
       case input2
         when 'Y'
-        r_files.each{|file| system "hiki --remove #{file}"}
+        r_files.each{|file| system "hiki rm #{file}"}
         p target = File.join($hiki_dir,'cache','attach',$basename)
         exit
         when 'n'
@@ -67,17 +69,6 @@ task :reset_hiki do
   }
 end
 
-desc "latex_dirのゴミを掃除"
-task :reset_latex_dir do
-  system "mv latex_dir/head.tex ."
-  system "mv latex_dir/jlisting.sty ."
-  system "rm -rf latex_dir"
-  system "mkdir latex_dir"
-  system "mv head.tex latex_dir/"
-  system "mv jlisting.sty latex_dir/"
-  system "rake latex_all"
-end
-
 desc "toc.hikiの作成"
 task :mk_toc do
   p target = $basename+'.toc'
@@ -102,18 +93,27 @@ end
 
 desc "FILE.hikiあるいはhikiファイルすべてを最新状態に更新"
 task :touch do
-  if file=ARGV[1] 
+  name=ARGV[1]||'.'
+  if File.exist?(File.join(name,$basename+'.hiki')) then
+    $target_dir = name
+  else
+    p file = File.basename(name)
+  end
+
+  if file
     file_split=file.split(".")
     p target = $basename==file_split[0] ? $basename : $basename+"_"+file_split[0]
-    system "hiki -u #{target}"
+    system "hiki touch #{target}"
   else
     p target = File.join($hiki_dir,'cache','attach',$basename)
     system "touch #{target}/*"
-    Dir.entries('.').each{|file|
+    Dir.entries($target_dir).each{|file|
+      puts file.red
       file_split=file.split(".")
       if file_split[1]=='hiki'
         p target = $basename==file_split[0] ? $basename : $basename+"_"+file_split[0]
-        system "hiki -u #{target}"
+        p command= "hiki touch #{target}"
+        system command
       end
     }
   end
@@ -122,14 +122,20 @@ end
 
 desc "FILE.hikiあるいはhikiファイルをedtiorで開く"
 task :open do
-  if file=ARGV[1]
+  name=ARGV[1]||'.'
+  if File.exist?(File.join(name,$basename+'.hiki')) then
+    $target_dir = name
+  else
+    p file = name
+  end
+  if file
     file += '.hiki' if file.split(".")[1]==nil
     system "open -a mi #{file}"
   else
-    Dir.entries('.').each{|file|
+    Dir.entries($target_dir).each{|file|
       file_split=file.split(".")
       if file_split[1]=='hiki'
-        p target = file_split[0]
+        p target = File.join($target_dir,file)
         system "open -a mi #{target}"
       end
     }
@@ -151,9 +157,11 @@ def latex_loop(entries,opts={})
   main_file=""
   entries.each{|file|
     options={:latex_all=>true}
-    next unless file.split('.')[1]=='hiki'
-    next if file=='toc.hiki'
-    next if file.include?('.hikirc')
+    file_basename= File.basename(file)
+    next unless file_basename.split('.')[1]=='hiki'
+    next if file_basename=='toc.hiki'
+    next if file_basename.include?('.hikirc')
+    puts file.red
     f_name =File.basename(file,'.hiki')
     if opts[:main]
       if f_name==$basename
@@ -188,15 +196,22 @@ end
 
 def check_bounding_box
 #  $bounding_box="0 0 442 432"
-#  $bounding_box=" 0 0 737 553"
-#  $fig_width="10"
-  $bounding_box=" 0 0 937 753"
-  $fig_width="12"
+#  $bounding_box=" 0 0 737 553" # for 60% converted
+  $fig_width="12" #for wrap figure
+  $bounding_box=" 0 0 937 753" # for original keynote output
+#  $fig_width="12" # for full size width
 end
 
-desc "すべてのhikiファイルをlatex変換"
+def get_target_entries
+  p entries=Dir.entries($target_dir)
+  entries.map!{|file| File.join($target_dir, file)}
+  puts entries.to_s.red
+  return entries
+end
+
+desc "すべてのDIR/hikiファイルをlatex変換"
 task :latex_all do
-  p entries=Dir.entries('.')
+  entries = get_target_entries
   main_file = latex_loop(entries,opts={:main=>true})
   latex_loop(entries)
   cont=""
@@ -245,6 +260,8 @@ def convert_to_latex(file_name, options={})
   p $save_name = ARGV[2] || File.join($latex_dir,tex_name)
   pre_name = File.join($latex_dir,'pre.tex')
   p pre_command = File.exist?(pre_name) ? '--pre '+pre_name : nil
+  p pre_command = ''
+
   lines = File.readlines(file_name)
   check_section_layers(lines) if options[:main]
   cont = ""
@@ -258,10 +275,11 @@ def convert_to_latex(file_name, options={})
   }
   tf1,tf2='tmp1.txt','tmp2.txt'
   File.open(tf1,'w'){|file| file.print cont}
+  options[:latex]="--head latex_dir/head.tex -p "
   system "hiki2latex #{pre_command} #{options[:latex]} #{tf1} > #{tf2}"
   lines = File.readlines(tf2)
   system "rm #{tf1} #{tf2}"
-  in_bib,cont=false,""
+  in_bib,in_abst,cont=false,false,""
   lines.each{|line|
     line=latex_cite_ref(line)
     if m=line.match(/\\caption{\s*\((.+?)\)(.+)}/)
@@ -277,11 +295,21 @@ def convert_to_latex(file_name, options={})
       in_bib=false
       line = "\\end{thebibliography}\n"
     end
-    if m=line.match(/\\item\[(.+)\](.+)/) and in_bib==true
-      tmp=m[2].gsub!(/\\verb\|(.*?)\|/){ "\\url{#{$1}}" }
+    if m=line.match(/\\item\[(.+?)\](.+)/) and in_bib==true
+      tmp = m[2].gsub!(/\\verb\|(.*?)\|/){ "\\url{#{$1}}" } || m[2]
+      tmp = m[2].gsub!(/\\verb\|(.*?)\|/){ "" } || m[2]
       line ="\\bibitem{#{m[1]}} #{tmp}"
       puts line.blue
     end
+    if m=line.match(/\\section{abstract:}/) and in_abst==false
+      in_abst=true
+      line = "\\begin{abstract}\n"
+      puts line.blue
+    end
+    if m=line.match(/\\section/) and in_abst==true
+      in_abst=false
+      line = "\\end{abstract}\n\n#{line}\n"
+    end
     if m=line.match(/\\includegraphics\[width=6cm\]\{(.+)\}/)
       p line="\\includegraphics\[width=#{$fig_width}cm,bb=#{$bounding_box}\]\{../figs/#{m[1]}\}\n"
       cont << line
@@ -392,7 +420,7 @@ task :sync => [:check_previous,:sync0]
 desc "hikiの強制同期"
 task :force_sync => [:sync0]
 
-def hiki_cite_ref(file)
+def hiki_cite_ref(file) #hiki cittations
   tf1 = 'tmp1.txt'
   lines = File.readlines(file)
   inside_pre_form,cont = false,""
@@ -413,26 +441,35 @@ def hiki_cite_ref(file)
 end
 
 task :sync0 do
-  entries=Dir.entries('.')
-  entries[2..-1].each{|source| #cp *.hiki
-    next unless source.split('.')[1]=='hiki'
-    next if source.include?('.hikirc')
-    p base = source.split('.')[0]
-    name = (base==$basename)? base : $basename+'_'+base
+  entries=get_target_entries
+  entries.each{|file| #cp *.hiki
+    file_basename= File.basename(file)
+    next unless file_basename.split('.')[1]=='hiki'
+    next if file_basename.include?('.hikirc')
+    f_name =File.basename(file,'.hiki')
+    puts f_name.red
+    name = (f_name==$basename)? f_name : $basename+'_'+f_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($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)
+    source = hiki_cite_ref(file)
     FileUtils.cp(source,target,:verbose=>true)
   }
 
+  source_dirs=['./figs','./refs']
+  source_dirs.each{|source_dir|
+    next unless Dir.exist?(source_dir)
+    p entries=Dir.entries(source_dir) #cp files in figs
+    p name = $basename+'_'+File.basename(source_dir)
+    p target = File.join($hiki_dir,'cache','attach',name)
+    FileUtils.mkdir_p(target,:verbose=>true) unless File.exists?(target)
+    entries[2..-1].each{|file|
+      next if FileTest.directory?(File.join(source_dir,file))
+      source = File.join(source_dir,file)
+#      FileUtils.cp(source,target,:verbose=>true)
+      FileUtils.cp(source,target)
+    }
+  }
   File.open('./.hikirc','w'){|file|
-    status, stdout, stderr =systemu "hiki -l #{$basename}*"
+    status, stdout, stderr =systemu "hiki ls #{$basename}"
     file.print($hiki_dir+"\n")
     stdout.split("\n")[3..-1].each{|line|
       file.print line+"\n"
@@ -451,6 +488,7 @@ end
 desc "self copy to hikiutils template directory"
 task :self_copy do
   p cp_files=[[File.join(Dir.pwd,'Rakefile'),'Rakefile_hiki_sync'],
+              [File.join(Dir.pwd,'Rakefile'),'Rakefile_hiki_sync_new'],
             [File.join(ENV['HOME'],'.my_help','hiki_help.yml'),'hiki_help.yml']]
   cp_files.each{|files|
     p source = files[0]
@@ -459,7 +497,7 @@ task :self_copy do
     status, stdout, stderr=systemu command
     if stdout!=''
       puts command.red
-      puts CodeRay.scan(stdout, :Diff).term  
+      puts CodeRay.scan(stdout, :Diff).term
       print " Are you sure to save #{source}? [Yn]  ".red
       FileUtils.cp(source,target,:verbose=>true) if STDIN.gets.chomp=='Y'
     end
@@ -469,7 +507,9 @@ end
 task :check_previous do
   current={}
   print "current hiki dir\n"
-  status, stdout, stderr = systemu("hiki -l #{$basename}*")
+  
+  status, stdout, stderr = systemu("hiki ls #{$basename}")
+  p stdout
   stdout.split("\n")[3..-1].each{|line|
     p line
     file=   line.split(/\s+/)[-1]