dyndoc-ruby-core 1.2.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 959ac04a47a0a747a74d9fc9412693de2f16e3bb
-  data.tar.gz: 1656c0ea29f80098f637aaf16b66774728e6d59a
+SHA256:
+  metadata.gz: 37c974a007f31e6b20f6b08a58059b0bc9fa3985f0c1942d827cc9790e562186
+  data.tar.gz: d1dd34fd772846afa17963341fcb13d54fc66452a1370efe5c146b707cb361b0
 SHA512:
-  metadata.gz: 92513ff73b9d2028e87848b27b8b8a9124d1a0c80e1c36574d3caf3cb9b1da7e942c8d6c549d8ee0bb972a1bbabcbb82bbc268fa10f4d78a56b3052789a61e83
-  data.tar.gz: 2e0f677656d6b279cc85d4b7eda91740ee774b25702f01070e7b435fca73fe4df12993195a474600b6b050ba5df037f405b40b0093ae6be1e8295b3a209aeaa1
+  metadata.gz: 50a41020a4dd69fe0d261b416f80e6a8d3a78728599564850f65542fd64f5f1e8f8459d3e567edb3c6306789e70d587674fa822e09a4a55cc1ba73d17c6852c5
+  data.tar.gz: 9f0f7cf7f5f39015606e2c2c14bbfea6fb24b118b9a8222414e1e17bffc9eb1d5ba1b9213658e9055f07a1fb7d80e4ef4084f0756fed008684bfacdeaac9f3b2

data/dyndoc/Tools/julia/Fig.dyn

@@ -0,0 +1,28 @@
+[#rb<]
+  $jlfig=0
+  $jlfig_exts={:png=>".png",:jpeg =>".jpg",:pdf=>".pdf"}
+[#<]
+
+{#def]imgJL[#,] jlcode[] [#,] img[]
+[#,] widthR[15] [#,] heightR[15][#,] unitR[cm][#,] resR[72][#,] optR[]
+[#,] optTex[scale=0.75]
+[#,] newR[TRUE]
+[#=]delete[FALSE]
+[#?]Dyndoc.tmpl_mngr.fmtOutput == "tex"[#<]
+  {#if]#{0?img}[#=]img[:{File.join($dyn_rsrc,"img","jlfig_:{$jlfig+=1}:{$jlfig_exts[:png]}")}]
+  [#else][#<]
+    {#if]File.dirname(#{=img})=="."[#>]img[:{File.join($dyn_rsrc,"img",#{=img})}][#if}
+  [#if}
+[#?]Dyndoc.tmpl_mngr.fmtOutput == "html"[#<]
+  {#if]#{0?img}[#=]img[#r{gsub("\\\\","/",tempfile(fileext=".png"))}][#=]delete[TRUE][#if}
+[#?]#{+?jlcode}[#<]#{jlcode}[#?]end
+[#R<]require(base64)
+#print(#{=img})
+codeimg<-img(#{=img})
+#print(codeimg)
+if(#{delete}) unlink(#{=img})
+[#?]Dyndoc.tmpl_mngr.fmtOutput == "html"
+[#>][#r{codeimg}]
+[#?]Dyndoc.tmpl_mngr.fmtOutput == "tex"
+[#>][\includegraphics[#{optTex}]{#{img}}]
+[#}

data/lib/dyndoc-core.rb

@@ -30,6 +30,9 @@ Settings.define 'cfg_dyn.cmd_pandoc_options', :type => Array, :default => []
 Settings.define 'cfg_dyn.options.pdflatex_nb_pass', :type => Integer, :default => 1
 Settings.define 'cfg_dyn.options.pdflatex_echo', :type => :boolean, :default => false
 Settings.define 'cfg_dyn.debug', :type => :boolean, :default => false
+Settings.define 'cfg_dyn.parse_rescue', :type => :boolean, :default => true
+Settings.define 'cfg_dyn.parse_rescue_mode', :type => Symbol, :default => :simple
+Settings.define 'cfg_dyn.ruby_only', :type => :boolean, :default => false
 
 Settings.define 'cfg_dyn.dyndoc_session', :type => Symbol, :default => :normal #or :interactive
 
@@ -44,6 +47,7 @@ Settings.define 'cfg_dyn.devel_mode', :type=> Symbol, :default=> :none
 Settings.define 'cfg_dyn.ruby_debug', :type=> Symbol, :default=> :none
 
 Settings.define 'cfg_dyn.model_doc', :default => "default"
+Settings.define 'cfg_dyn.exec_mode', :default => "no"
 Settings.define 'cfg_dyn.format_doc', :default => :tex
 Settings.define 'cfg_dyn.pandoc_filter', :default => ""
 
@@ -61,7 +65,7 @@ require 'dyndoc/init/config'
 Dyndoc.init_dyndoc_library_path
 Dyndoc.init_rootDoc
 Dyndoc.add_logger
-Dyndoc.logger.info("dyndoc-core loaded!")
+## Dyndoc.logger.info("dyndoc-core loaded!")
 ## Dyndoc.logger.info(".dyndoc.yml: "+File.join(ENV["HOME"],".dyndoc.yml"))
 
 CqlsDoc=Dyndoc #for compatibity

data/lib/dyndoc/base/filter/filter_mngr.rb

@@ -395,7 +395,7 @@ module Dyndoc
       when "@"
         return txt if  @mode==:pre
         res=CallFilter.output(txt,self)
-      when "#","##"
+      when "#","##","%"
 #p @envir
         #p @envir.output(txt,@mode,@escape)
         #p @envir.output(in_type+"{"+txt2+"}",@mode,@escape)
@@ -575,7 +575,7 @@ module Dyndoc
         else
           res.to_s
         end
-      when "=","@=","#=","##=" ,"none="
+      when "=","@=","#=","%=","##=" ,"none="
 #puts "convert [=]";p res
         if res.is_a? Array
           res.join(",")
@@ -587,7 +587,7 @@ module Dyndoc
             "%Q{"+res2+"}"
           end
         end
-      when "","@","#","##","none","#F"
+      when "","@","#","%","##","none","#F"
         if res.is_a? Array
           res.join(",")
         else

data/lib/dyndoc/base/filter/server.rb

@@ -93,7 +93,9 @@ module Dyndoc
 	        end
 
 	    rescue SyntaxError
-	        puts "RbServer syntax error in: "+code
+			
+			$outRbError="RbServer syntax error in: "+code
+			puts $outRbError
 	        raise SystemError if Dyndoc.cfg_dyn[:dyndoc_mode]==:normal and  Dyndoc.cfg_dyn[:ruby_debug]!=:none
 	        if Dyndoc.cfg_dyn[:dyndoc_mode]!=:normal
 	        	$dyn_logger.write("\nERROR Ruby Syntax:\n"+code+"\n")
@@ -104,10 +106,30 @@ module Dyndoc
       	out
     end
 
+    def RbServer.redirect
+      if block_given?
+        require 'stringio'
+        begin
+          # redirect output to StringIO objects
+          oldstdout,oldstderr=$stdout, $stderr
+          stdout, stderr = StringIO.new, StringIO.new
+          $stdout, $stderr = stdout, stderr
+          yield
+        ensure
+          # restore normal output
+          $stdout, $stderr = oldstdout,oldstderr
+        end
+        return {stdout: stdout.string, stderr: stderr.string}
+      else
+        return {stdout: "", stderr: ""}
+      end
+
+    end
+
     def RbServer.capture(code,rbEnvir=nil)
 
     	require 'stringio'
-		require 'ostruct'
+		  require 'ostruct'
 
 		begin
 		    # redirect output to StringIO objects
@@ -273,10 +295,10 @@ module Dyndoc
 		      short[0]=short[0].to_i
 		      short[2]=short[2].to_i
 		      ## Dyndoc.warn "short",[short,txt]
-		      (0...short[0]).each{|i| txtout << txt[i].force_encoding("utf-8") << "\n"}
+		      (0...short[0]).each{|i| txtout << (txt[i] ? txt[i].force_encoding("utf-8") : "") << "\n"}
 		      txtout << short[1] << "\n"
 		      le = txt.length
-		      ((le-short[2])...le).each{|i| txtout << txt[i].force_encoding("utf-8") << "\n"}
+		      ((le-short[2])...le).each{|i| txtout << (txt[i] ? txt[i].force_encoding("utf-8") : "") << "\n"}
 		    else
 		    	txt=txt.map{|e| e.force_encoding("utf-8")}
 		      txtout << txt.join("\n")
@@ -808,59 +830,73 @@ module Dyndoc
 	@@initVerb=nil
 
 	def JLServer.initVerb
-		Julia << "include(\""+File.join(Dyndoc.cfg_dir[:gem_path],"share","julia","dyndoc.jl")+"\")"
+		Julia << "Base.include(@__MODULE__,\""+File.join(Dyndoc.cfg_dir[:gem_path],"share","julia","dyndoc.jl")+"\")"
+		Julia << "push!(Libdl.DL_LOAD_PATH,\"/usr/lib\");push!(Libdl.DL_LOAD_PATH,\"/usr/local/lib\")"
 		@@initVerb=true
 	end
 
 	def JLServer.inputsAndOutputs(code,hash=true)
 		JLServer.initVerb unless @@initVerb
-		res=(Julia << 'capture_julia('+code.strip.inspect+')')
-		## Dyndoc.warn "JLServer.inputsAndOutputs",res
-		res.map!{|input,output,output2,error,error2|
+    Dyndoc.logger.info("JLServer.inputsAndOutputs: "+code.strip)
+  	res=(Julia << 'capture_output_julia('+code.strip.inspect.gsub("$","\\$")+')')
+    Dyndoc.logger.info("JLServer.inputsAndOutputs:"+res.inspect)
+    res.map!{|input,output,output2,error,error2|
 			{:input=>input,:output=>output,:output2=>output2,:error=>error,:error2=>error2}
 		} if res and hash
 		res
 	end
 
 	def JLServer.eval(code)
-		Julia.eval(code)
+		Julia.eval("capture_output_julia("+code.strip.inspect.gsub("$","\\$")+")")
 	end
 
 	def JLServer.output(code,opts={})
-		opts={:print=>true}.merge(opts)
+		#opts={:print=>true}.merge(opts)
 		## Dyndoc.warn "jlserv",code+"|"+Julia.eval(code,:print=>opts[:print]).to_s
-		Julia.eval(code,:print=>opts[:print]).to_s
+		#Julia.eval(code,:print=>opts[:print]).to_s
+		
+		res=JLServer.inputsAndOutputs(code,false)
+		Dyndoc.warn "jlserv.output",[code,res]
+		return "" unless res
+		res=res.map{|input,output,output2,error,error2|
+			#Dyndoc.warn "output",output
+			output
+		}
+		res.length==0 ? "" : res[-1] 
 	end
 
 	def JLServer.outputs(code,opts={}) #may have more than one lines in code
 		## Dyndoc.warn "JLServer.outputs opts",opts
-		## Dyndoc.warn "JLServer code",code
+		## 
+		Dyndoc.warn "JLServer code",code
+		res=JLServer.inputsAndOutputs(code,false)
 		if opts[:block]
-			res=JLServer.inputsAndOutputs(code,false)
 			return "" unless res
 			res.map{|input,output,output2,error,error2|
 				## Dyndoc.warn "output2",output2
-				output2
+				output
 			}.join("\n")
-		else
-			JLServer.eval(code)
 		end
 	end
 
 	def JLServer.echo(code,prompt="julia> ",tab=2)
 		out=""
 		res=JLServer.inputsAndOutputs(code)
-		## Dyndoc.warn "JLServer",res
+		## 
+		Dyndoc.warn "JLServer",res
+    return "Error when executing: "+code unless res
 		res.each do |cmd|
 			## Dyndoc.warn "input",cmd
 		 	out << prompt+ cmd[:input].split("\n").each_with_index.map{|e,i| i==0 ? e : " "*(prompt.length)+e}.join("\n").gsub(/\t/," "*tab)
-			out << "\n"
+			out << "\n" unless cmd[:input].strip[-1]==";"
 			## Dyndoc.warn "output1",out
-			out << cmd[:output2]
-			out << (cmd[:output]=="nothing"  ? "" : cmd[:output])
-			## Dyndoc.warn "output2",out
-			out << cmd[:error]!=""  ? cmd[:error] : ""
-			out << (cmd[:output]=="nothing"  ? "" : "\n\n")
+      if cmd[:error]==""
+  			out << ((cmd[:output]=="nothing" or (cmd[:input].strip)[-1]==";")  ? "" : cmd[:output])
+        out << ((cmd[:output2]=="nothing" or (cmd[:input].strip)[-1]==";")  ? "" : cmd[:output2]) #cmd[:output2]
+  		else
+			  out << cmd[:error]
+      end
+			out << (cmd[:output]=="nothing" ? "" : "\n")
 			## Dyndoc.warn "output3",out
 		end
 		out

data/lib/dyndoc/base/scanner.rb

@@ -219,7 +219,7 @@ module Dyndoc
         #IMPORTANT: process has to have as the second argument e[:type] corresponding to the inside_type and as the third argument res[:type] corresponding to the out_type
 ##Dyndoc.warn "scan",txt2,e[:type],res[:type],(filter ? filter.process(txt2,e[:type],res[:type]) : txt2)
         txt2=((filter and !(txt2=~/\[HTML\]/)) ? filter.process(txt2,e[:type],res[:type]) : txt2)
-##p txt2
+##p [:txt2,txt2]
         txt << txt2
       end
 #puts "txt";p txt
@@ -232,7 +232,7 @@ module Dyndoc
   class CallScanner < Scanner
 
     @@type[:call]={
-          :start=>/\\?(?:\#|\#\#|@|#F|#R|#r|\:R|\:r|#Rb|#rb|\:|\:Rb|\:rb|\:jl|#jl)?\{/,
+          :start=>/\\?(?:\#|\%|\#\#|@|#F|#R|#r|\:R|\:r|#Rb|#rb|\:|\:Rb|\:rb|\:jl|#jl)?\{/,
           :stop=>     /\\?\}/,
           :mode=>{:start=>-1,:stop=>0,:length=>1},
           :escape_start=>['\{'], #doivent être parsable dans start
@@ -257,11 +257,11 @@ module Dyndoc
         }
 =end
       @@type[:dtag] = {
-          :start=>'\{[\#\@]([\w\:\|-]*[<>]?[=?!><]?(\.\w*)?)\]',
-          :stop=>  '\[[\#\@]([\w\:\|-]*[<>]?[=?!><]?)\}',
-          :atom=>{:match=>/(\{[\#\@][\w\:\|]*)([\#\@]\})/,:replace=>{2=>"][#}"}},
+          :start=>'\{[\#\@\%]([\w\:\|-]*[<>]?[=?!><]?(\.\w*)?)\]',
+          :stop=>  '\[[\#\@\%]([\w\:\|-]*[<>]?[=?!><]?)\}',
+          :atom=>{:match=>/(\{[\#\@\%][\w\:\|]*)([\#\@\%]\})/,:replace=>{2=>"][#}"}},
           :block=> '\]', #no longer |
-          :keyword=>['\[[\#\@]','\]'],
+          :keyword=>['\[[\#\%\@]','\]'],
           :mode=>{:start=>0,:stop=>-1,:length=>1}
         }
 
@@ -275,7 +275,7 @@ module Dyndoc
       init_tag(@tag_type) if [:dtag].include? @tag_type
     end
 
-    @@tagblck_set=[:<<,:<,:do,:>>,:>,:">!",:out,:nl,:"\\n",:"r<",:"R<",:"rb<",:"m<",:"M<",:"jl<",:"r>>",:"R>>",:rverb,:"rb>>",:rbverb,:"jl>>",:jlverb,:rout,:"r>",:"R>",:"rb>",:"m>",:"M>",:"jl>",:"_<",:"_>",:"__>",:"html>",:"tex>",:"txtl>",:"ttm>",:"md>",:"adoc>",:tag,:"??",:"?",:yield,:"=",:"-",:+,:"%",:"tex=",:"tex+",:"md=",:"md+",:"adoc=",:"adoc+",:"html=",:"html+",:"rb=",:"rb+",:"R=",:"R+",:"jl=",:"jl+",:"txtl=",:"txtl+"]
+    @@tagblck_set=[:<<,:<,:do,:>>,:>,:">!",:out,:nl,:"\\n",:"r<",:"R<",:"rb<",:"m<",:"M<",:"jl<",:"sh<",:"r>>",:"R>>",:rverb,:"rb>>",:rbverb,:"jl>>",:jlverb,:rout,:"r>",:"R>",:"rb>",:"m>",:"M>",:"jl>",:"_<",:"_>",:"__>",:"html>",:"tex>",:"txtl>",:"ttm>",:"md>",:"adoc>",:tag,:"??",:"?",:yield,:"=",:"-",:+,:"%",:"tex=",:"tex+",:"md=",:"md+",:"adoc=",:"adoc+",:"html=",:"html+",:"rb=",:"rb+",:"R=",:"R+",:"jl=",:"jl+",:"txtl=",:"txtl+"]
     #Rmk: when a symbol is included in another one, you have to place it before! Ex: :>> before :> and also :<< before :<
 
     @@tagblck_dyndoc_set = [:main,:content,:before,:after,:require,:helpers,:preamble,:postamble,:style,:title,:path,:first,:last,:default,:cfg]
@@ -302,6 +302,7 @@ module Dyndoc
           :"rb<" => [:blck, :"rb<"],
           :"R<" =>  [:blck, :"R<"],
           :"jl<" => [:blck, :"jl<"],
+          :"sh<" => [:blck, :"sh<"],
           :"r>>" => [:blck, :"r>>"],
           :"R>>" => [:blck, :"r>>"],
           :"*<" =>  [:blck, :"*<"],
@@ -366,7 +367,7 @@ module Dyndoc
       	},
         :mode_arg=>:next_block,
         :tag_code=>[:code,:<,:>,:<<,:txt], #used for arg mode!
-        :arg=>[:if,:unless,:elsif,:for,:case,:def,:func,:meth,:new,:super,:call,:input,:when,:break,:set,:style,:keys,:"?",:"rb<",:"r<",:"R<",:"m<",:"M<",:"jl<"],
+        :arg=>[:if,:unless,:elsif,:for,:case,:def,:func,:meth,:new,:super,:call,:input,:when,:break,:set,:style,:keys,:"?",:"rb<",:"r<",:"R<",:"m<",:"M<",:"jl<",:"sh<"],
         :blck=>{
           :instr=>[:document,:if,:unless,:case,:loop,:set,:tag,:keys,:rverb,:rbverb,:jlverb,:for],
           :keyword=>{
@@ -620,11 +621,12 @@ module Dyndoc
 	        end
 ##Dyndoc.warn "to scan", @scan.string[@scan.pos..-1]
 ##Dyndoc.warn "tag_reg",[blocktag_reg,tag_reg]
+##p ["tag_reg",[blocktag_reg,tag_reg]]
 	      end
         if (tag_keyword and (@scan.check_until(blocktag_reg))) #or (!@named_tags.empty? and check_until_for_named_tags)
 	        check_until_for_named_tags unless @named_tags.empty?
           key=@scan[2]
-##Dyndoc.warn "keyword",[key,@scan[0],@scan[1],@scan[2]]
+##Dyndoc.warn p ["keyword",[key.scan(tag_reg),key.scan(tag_reg)[-1],key,@scan[0],@scan[1],@scan[2]]]
 ##Dyndoc.warn "pre_math,tag_selected",[@scan.pre_match,@tag_selected] if key=="[#tag]"
           res << find_text(from,key,inside)
           @is_arg=false if @is_arg
@@ -634,7 +636,7 @@ module Dyndoc
 	          res << (key=@tag_selected)
 	        else
 	    #key=tag_reg.match(key)[0]
-	          key= key.scan(tag_reg)[0]
+	          key= key.scan(tag_reg)[-1]
 ##Dyndoc.warn "key(AP)",key if key=="tag"
 	          res << (key=key.to_sym) if key and !key.empty?
 	        end

data/lib/dyndoc/base/tmpl/eval.rb

@@ -201,13 +201,15 @@ module Dyndoc
 #p input
 =end
       	  # REPLACEMENT of  ABOVE!
-      	  unless @libs.keys.include? tmpl
-      	    input=Dyndoc.read_content_file(tmpl)
-      	    @libs[tmpl]=input
-      	    filter.envir["_FILENAME_"]=tmpl.dup #register name of template!!!
-      	    filter.envir["_FILENAME_ORIG_"]=tmpl_orig.dup #register name of template!!!
-      	    filter.envir["_PWD_"]=File.dirname(tmpl) #register name of template!!!
-      	    txt=parse(@libs[tmpl],filter,tags)
+          unless @libs.keys.include? tmpl
+            if tmpl and File.exists? tmpl
+              input=Dyndoc.read_content_file(tmpl)
+              @libs[tmpl]=input
+              filter.envir["_FILENAME_"]=tmpl.dup #register name of template!!!
+              filter.envir["_FILENAME_ORIG_"]=tmpl_orig.dup #register name of template!!!
+              filter.envir["_PWD_"]=File.dirname(tmpl) #register name of template!!!
+              txt=parse(@libs[tmpl],filter,tags)
+            end
       	  end
         }
       end 

data/lib/dyndoc/base/tmpl/manager.rb

@@ -89,16 +89,17 @@ module Dyndoc
       # init rb4jl stuff
       # since inside ruby, no need Ruby.start and Ruby.stop like in rb4R.
       # sort of equivalent of JLServer.init_filter (but not yet defined)!
-      Julia << "include(\""+File.join(Dyndoc.cfg_dir[:gem_path],"share","julia","ruby.jl")+"\")"
+      #Julia << "Base.include(@__MODULE__,\"ruby.jl\")"
+      Julia << "Base.include(@__MODULE__,\""+File.join(Dyndoc.cfg_dir[:gem_path],"share","julia","ruby.jl")+ "\")"
       Dyndoc.logger.info "initJulia: ruby.jl"
-      Julia << "include(\""+File.join(Dyndoc.cfg_dir[:gem_path],"share","julia","dynArray.jl")+"\")"
+      Julia << "Base.include(@__MODULE__,\""+File.join(Dyndoc.cfg_dir[:gem_path],"share","julia","dynArray.jl")+ "\")"
       Dyndoc.logger.info "initJulia: dynArray.jl"
       #-| To debug ruby.jl and dynArray.jl => uncomment below and commnt above
       # Julia << "include(\""+File.expand_path("~/Github/dyndoc/share/julia/ruby.jl")+"\")"
       # Julia << "include(\""+File.expand_path("~/Github/dyndoc/share/julia/dynArray.jl")+"\")"
-      Julia << "using Dyndoc"
+      Julia << "using Main.Dyndoc"
       Dyndoc.logger.info "initJulia: using Dyndoc"
-      Julia << "Ruby.alive(true)"
+      Julia << "Dyndoc.Ruby.alive(true)"
       #Julia << "global const _dynArray=DynArray()"
       Dyndoc.logger.info "Julia initialized inside dyndoc!"
 
@@ -120,8 +121,10 @@ module Dyndoc
       @cfg[:part_tag][0]=@cfg[:part_tag][0][1..-1] if !(@cfg[:part_tag].empty?) and (@partTag_add= (@cfg[:part_tag][0][0,1]=="+"))
 =end
       ## default system root appended
-      TemplateManager.initR if Dyndoc.cfg_dyn[:langs].include? :R
-      TemplateManager.initJulia if Dyndoc.cfg_dyn[:langs].include? :jl
+      unless  Dyndoc.cfg_dyn[:ruby_only]
+        TemplateManager.initR if Dyndoc.cfg_dyn[:langs].include? :R
+        TemplateManager.initJulia if Dyndoc.cfg_dyn[:langs].include? :jl
+      end
       rbenvir_init(binding)
       @rEnvir=["Global"]
       @envirs={}

data/lib/dyndoc/base/tmpl/parse_do.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require 'securerandom'
+
 ## TODO: .force_encoding("utf-8") needs to be added (see server.rb)
 module Dyndoc
 
@@ -26,10 +28,11 @@ module Dyndoc
   class TemplateManager
 
     @@depth=0
+    @@outError=""
 
     @@cmd=["newBlck","input","require","def","func","meth","new","super","blck","do","if","for","case", "loop","r","renv","rverb","rbverb","jlverb","rout","rb","var","set","hide","format","txt","code","<","<<",">","eval","ifndef","tags","keys","opt","document","yield","get","part","style"]
     ## Alias
-    @@cmdAlias={"unless"=>"if","out"=>"do","r<"=>"r","R<"=>"R","rb<"=>"rb","r>"=>"r","R>"=>"R","rb>"=>"rb","m<"=>"m","M<"=>"m","m>"=>"m","M>"=>"m","jl>"=>"jl","jl<"=>"jl","<"=>"txt","<<"=>"txt",">"=>"txt","code"=>"txt","dyn"=>"eval","r>>"=>"rverb","R>>"=>"rverb","rout"=>"rverb","rb>>" => "rbverb","jl>>" => "jlverb","saved"=>"blck","blckAnyTag"=>"blck"}
+    @@cmdAlias={"unless"=>"if","out"=>"do","r<"=>"r","R<"=>"R","rb<"=>"rb","r>"=>"r","R>"=>"R","rb>"=>"rb","m<"=>"m","M<"=>"m","m>"=>"m","M>"=>"m","jl>"=>"jl","jl<"=>"jl","sh<"=>"sh","<"=>"txt","<<"=>"txt",">"=>"txt","code"=>"txt","dyn"=>"eval","r>>"=>"rverb","R>>"=>"rverb","rout"=>"rverb","rb>>" => "rbverb","jl>>" => "jlverb","saved"=>"blck","blckAnyTag"=>"blck"}
     @@cmd += @@cmdAlias.keys
 
     def add_dtag(dtag,cmdAlias=nil)
@@ -87,7 +90,7 @@ module Dyndoc
       @vars,varsOld=filterLoc.envir,@vars
       Dyndoc.vars=@vars
       @filter=filterLoc unless @filter ##root filter
-      out=""
+      out,$outError ="",""
 #p texblock
       texblock.map{|b|
 #p b
@@ -96,33 +99,49 @@ module Dyndoc
         cmd=@@cmdAlias[cmd] if @@cmdAlias.keys.include? cmd
 #Dyndoc.warn "parse:cmd,b",[cmd,b]
         @@depth+=1
-        ###TO temporarily AVOID RESCUE MODE:
-        ###
-        if true; method("do_"+cmd).call(out,b,filterLoc); else
-        begin
-          ## Dyndoc.warn "cmd",[cmd,b]
-          method("do_"+cmd).call(out,b,filterLoc)
-          ## Dyndoc.warn [:out,out] if cmd=="eval"
-        rescue
-          puts "=> Leaving block depth #{@@depth}: "
-          codeText=b.inspect
-          ##Dyndoc.warn "codeText",codeText
-          nbChar=(Dyndoc.cfg_dyn[:nbChar_error]) ? Dyndoc.cfg_dyn[:nbChar_error] : 80
-          if codeText.length > nbChar
-            codeText=codeText[0..((nbChar*2/3).to_int)]+" ...... "+codeText[(-(nbChar/3).to_int)..-1]
-          end
-          puts codeText
-          if @@depth==1
-            puts "=> Exiting abnormally!\n"
-            raise SystemExit
-          else
-            raise RuntimeError, "Dyn Runtime Error"
+        ## To deactivate, put it inside ~/.dyndoc.yml
+        if Dyndoc.cfg_dyn[:parse_rescue]
+          begin
+            ## Dyndoc.warn "cmd",[cmd,b]
+            method("do_"+cmd).call(out,b,filterLoc)
+            ## Dyndoc.warn [:out,out] if cmd=="eval"
+          rescue
+            $outError << "=> Leaving block depth #{@@depth}: " << "\n"
+            codeText = b.inspect
+            ##Dyndoc.warn "codeText",codeText
+            nbChar=(Dyndoc.cfg_dyn[:nbChar_error]) ? Dyndoc.cfg_dyn[:nbChar_error] : 80
+            if codeText.length > nbChar
+              codeText=codeText[0..((nbChar*2/3).to_int)]+" ...... "+codeText[(-(nbChar/3).to_int)..-1]
+            end
+            $outError << codeText << "\n"
+            if $outRbError && !$outRbError.empty? 
+              $outError << $outRbError << "\n"
+              $outRbError = ""
+            end
+            if @@depth==1
+              $outError << "=> Exiting abnormally!</code>" << "\n"
+              @@outError << "<pre style='background-color: #EBECE4;'><code>"+$outError+"</code></pre>" << "\n"
+              puts "@@outError: \n"+@@outError
+              #raise SystemExit
+              out << @@outError
+              @@outError=""
+            else
+              @@outError << "<pre style='background-color: #EBECE4;'><code>Dyn Runtime Error\n"+$outError+"</code></pre>"
+              $outError=""
+              if Dyndoc.cfg_dyn[:parse_rescue_mode]==:simple 
+                out << @@outError
+                @@outError=""
+              else
+                raise RuntimeError, "Dyn Runtime Error"
+              end
+            end
+            Dyndoc.warn "out #{@@depth} :",$outError
+
+          ensure
+            @@depth -= 1
           end
-        ensure
-          @@depth -= 1
-        end
-        ###TO temporarily AVOID RESCUE MODE:
-        ###
+        else
+          method("do_"+cmd).call(out,b,filterLoc)
         end
       }
       ##restore old partTag and vars
@@ -404,7 +423,7 @@ p [vars,b2]
         if @@newBlcks.keys.include? @blckDepth[-1]
           @blckName ||= []
           tmp=blck[1][1].strip
-          @blckName << (tmp.empty? ? `uuidgen`.strip : tmp)
+          @blckName << (tmp.empty? ? SecureRandom.uuid.strip : tmp)
           #puts "blckNAME";p @blckName
         end
 
@@ -482,7 +501,7 @@ p [vars,b2]
           when :do,:<
             i,*b2=next_block(blck,i)
             parse(b2,filter) if cond_tag and cond
-          when :"r<",:"rb<",:"R<",:"m<",:"M<",:"jl<"
+          when :"r<",:"rb<",:"R<",:"m<",:"M<",:"jl<",:"sh<"
             # if current_block_tag==:"jl<"
             #   ##p "iciiiii"
             # end
@@ -498,7 +517,7 @@ p [vars,b2]
                 b2=[code.unshift(newblck)]
     ##puts "r<;rb<";p b2
                 filter.outType=":"+(blck[i].to_s)[0...-1]
-                #p filter.outType
+                #Dyndoc.warn "rb,jl,R block",filter.outType
                 parse(b2,filter)
                 filter.outType=nil
         	    end
@@ -1056,7 +1075,7 @@ p [vars,b2]
           when :binding
             i,*b2=next_block(blck,i)
             rbEnvir=b2[0][1].strip
-          when :do,:<,:out,:>,:"r<",:"rb<",:"r>",:"R>",:"R<",:"r>>",:rverb,:"rb>>",:rbverb,:"jl>>",:jlverb,:"rb>",:"?",:tag,:"??",:yield,:>>,:"=",:"+",:<<,:"txtl>",:"md>",:"adoc>",:"ttm>",:"html>",:"tex>",:"_>"
+          when :do,:<,:out,:>,:"r<",:"rb<",:"r>",:"R>",:"R<",:"r>>",:rverb,:"rb>>",:rbverb,:"jl>>",:jlverb,:"jl>",:"jl<",:"sh<",:"rb>",:"?",:tag,:"??",:yield,:>>,:"=",:"+",:<<,:"txtl>",:"md>",:"adoc>",:"ttm>",:"html>",:"tex>",:"_>"
             code = blck[i..-1].unshift(:blck)
           when :","
             i,*b2=next_block(blck,i)
@@ -2138,6 +2157,7 @@ p call
     def do_jl(tex,blck,filter)
       return unless Dyndoc.cfg_dyn[:langs].include? :jl
       ## jlBlock stuff
+      ## Dyndoc.warn "do_jl",blck
       as_default_tmpl_mngr! if
       dynBlock=dynBlock_in_doLangBlock?(blck)
       if dynBlock
@@ -2161,7 +2181,7 @@ p call
         as_default_tmpl_mngr!
         tex << JLServer.outputs(code,:block => true)
       else
-        JLServer.eval(code)
+        JLServer.outputs(code)
       end
       ## revert all the stuff
       if dynBlock
@@ -2171,6 +2191,15 @@ p call
       filter.outType=nil
     end
 
+    def do_sh(tex,blck,filter)
+#Dyndoc.warn "do_sh: blck ";p blck[1..-1]
+      filter.outType="none"
+      code=parse(blck[1..-1],filter)
+      %x[ #{code} ]
+#Dyndoc.warn "do_sh: code ";p code
+      filter.outType=nil
+    end
+
     def do_m(tex,blck,filter)
       newblck=blck[0]
 # Dyndoc.warn "do_m";p blck