dyndoc-ruby-core 1.4.8 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f4236705f48cc9db8e234489a77303b4213389b1dbf4f4d5681851cb1f8a7c
-  data.tar.gz: 04423ca31ef550ea3e30d5fddc86cb5027064b8ac68aefe733da9a13f6444130
+  metadata.gz: 0b27ebc4ded9a4c39100237831dbbaddc0fd5b7448902512c65c3d9d6b8e99df
+  data.tar.gz: ffd6521535cfdcaad7bbc2c1c6d484e4ead55e10441896d38d3161aa64f1e9b6
 SHA512:
-  metadata.gz: be41ec047d2d52b9d3963e23f664989b2bb6eed24c4ee1e0df7737b9f4a0814026f04fac7cf8341c7af79e27a63e2f244cfbed87cedf2dfa24232de8970cd0fe
-  data.tar.gz: 9f482b734d270328b608ee7ec6bfcbde417df4ee65f0f48a42384c78c62c15ed7736479992c5a9f2313c223e19003f523512e9837d8ef6867ada8a3f339df5a5
+  metadata.gz: b25f6cda8f759e8f468deb59d946312d242c3006a44ca32c5e087a0ad5654d5ce1d148224729f0b90365c51dd7d4abd7e3832fdbd5a5b90ee551e3829f04ec3e
+  data.tar.gz: '0884f5956472578c84b6736838062d6e3434aaa1612e87d409d256d83f2c2f6de4ba976485a4f1c798a6e070bb586823b2f1352214065b7ba96eb3ca602a1539'

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

@@ -378,7 +378,8 @@ module Dyndoc
           $dyn_logger.write("ERROR R: #{txt} was not properly evaluated!\n") unless Dyndoc.cfg_dyn[:dyndoc_mode]==:normal
           res=txt
         end
-        #puts "#{txt} in #{@rEnvir[0]} is #{res}"
+        #
+        puts "#{txt} in #{@rEnvir[0]} is #{res}"
       when ":r","#r"
         return txt if @mode==:pre
         res=RServer.safe_output(txt2,@rEnvir[0],:pretty=>true)
@@ -387,7 +388,8 @@ module Dyndoc
           $dyn_logger.write("ERROR R: #{txt} was not properly evaluated!\n") unless Dyndoc.cfg_dyn[:dyndoc_mode]==:normal
           res=txt
         end
-        #puts "#{txt} in #{@rEnvir[0]} is #{res}"
+        #
+        puts "#{txt} in #{@rEnvir[0]} is #{res}"
       when ":jl","#jl"
         return txt if @mode==:pre
         ## puts "#jl:"+txt2
@@ -395,7 +397,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)
@@ -538,15 +540,14 @@ module Dyndoc
       return res unless out_type
       case out_type
       when ":=",":rb=",":Rb=","#rb=","#Rb="
-        #if res.is_a? String
-        #  res.inspect
-        #else res.is_a? Array
+        if res.is_a? String
+         res.inspect
 #puts out_type;p res;p res.inspect
-        #if res.is_a? Array and res.length==1 and res[0].is_a? String
-        #  res[0].inspect
-        #else
+        elsif res.is_a? Array and res.length==1
+         res[0].inspect
+        else
           res.inspect
-        #end
+        end
       when ":",":rb",":Rb","#rb","#Rb"
 #puts "convert [rb]:";p res
         if res.is_a? Array
@@ -555,6 +556,7 @@ module Dyndoc
           res.to_s
         end
       when ":R=","#R=",":r=","#r="
+#puts "convert [R]";p res
         if res.is_a? Array
           res2="c("+res.map{|e| "'"+e.to_s+"'"}.join(",")+")"
           res2.gsub!(/\\/,'\\\\\\\\')
@@ -575,7 +577,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 +589,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

@@ -831,8 +831,8 @@ module Dyndoc
 
 	def JLServer.initVerb
 		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
+		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)
@@ -904,13 +904,15 @@ module Dyndoc
 
 	def JLServer.echo_verb(txt,mode)
       txtout=Dyndoc::JLServer.echo(txt).strip
+	  ## p [:jl_echo_verb,txtout]
       mode=:default unless Dyndoc::VERB.keys.include? mode
       header= (mode!=:default) and txtout.length>0
       out=""
       out << Dyndoc::VERB[mode][:begin] << "\n" if header
       out << txtout
       out << "\n" << Dyndoc::VERB[mode][:end] << "\n" if header
-      out
+      ## p [:out, out]
+	  out
     end
 
   end

data/lib/dyndoc/base/scanner.rb

@@ -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}
         }
 
@@ -621,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
@@ -635,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/manager.rb

@@ -151,6 +151,9 @@ module Dyndoc
     ## equivalent to :pre_doc for not interactive document
     def require_first
       require_dyndoc_libs("Dyn/Base")
+      Dyndoc.cfg_dyn[:require_first].each do |libs|
+        require_dyndoc_libs(libs)
+      end
     end
 
     def require_dyndoc_libs(libs)

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

@@ -646,7 +646,7 @@ p [vars,b2]
       	         end
       	  when :"r>>",:"R>>",:rout,:rverb
       	    newblck=blck[i]
-                  i,*b2=next_block(blck,i)
+            i,*b2=next_block(blck,i)
       	    if cond_tag and cond
                   vars,b2=get_named_blck(b2,filter)
                   if b2
@@ -671,7 +671,7 @@ p [vars,b2]
       	    end
           when :"jl>>",:jlverb,:"rb>>",:rbverb
             newblck=blck[i]
-                  i,*b2=next_block(blck,i)
+            i,*b2=next_block(blck,i)
             if cond_tag and cond
                   vars,b2=get_named_blck(b2,filter)
                   if b2
@@ -690,12 +690,12 @@ p [vars,b2]
           tex << val
               end
 =end
-                    make_named_blck(tex,filter,vars,b2)
-                    filter.outType=nil
-                  end
+                make_named_blck(tex,filter,vars,b2)
+                filter.outType=nil
+              end
             end
-                when :>>
-                  i,*b2=next_block(blck,i)
+            when :>>
+              i,*b2=next_block(blck,i)
       	    if cond_tag and cond
                   file,b2=get_named_blck(b2,filter)
                   if b2 and file
@@ -1827,7 +1827,7 @@ p call
       require "dyndoc/common/uv" if @@interactive
 
       warn_level = $VERBOSE;$VERBOSE = nil
-      tex << (resUV=(@@interactive ? Uv.parse(res.force_encoding("utf-8"), "xhtml", File.join(Uv.syntax_path,"r.syntax") , false, "solarized",false) : res.force_encoding("utf-8") ))
+      tex << (resUV=(@@interactive ? Uv.parse(res.force_encoding("utf-8"), "xhtml", File.join(Uv.syntax_path,"source.r.syntax") , false, "solarized",false) : res.force_encoding("utf-8") ))
       $VERBOSE = warn_level
 #Dyndoc.warn "rverb:result",resUV
       @rEnvir.shift if inR
@@ -1860,7 +1860,7 @@ p call
       ## Dyndoc.warn "rbverb:res",res
       require "dyndoc/common/uv" if @@interactive
       warn_level = $VERBOSE;$VERBOSE = nil
-      tex << (@@interactive ? Uv.parse(res, "xhtml", File.join(Uv.syntax_path,"ruby.syntax") , false, "solarized",false) : res )
+      tex << (@@interactive ? Uv.parse(res.force_encoding("utf-8"), "xhtml", File.join(Uv.syntax_path,"source.ruby.syntax") , false, "solarized",false) : res )
       $VERBOSE = warn_level
 #puts "rverb:result";p res
 
@@ -1892,9 +1892,10 @@ p call
       res=JLServer.echo_verb(code,@@interactive ? :raw : mode)
       require "dyndoc/common/uv" if @@interactive
       warn_level = $VERBOSE;$VERBOSE = nil
-      tex << (@@interactive ? Uv.parse(res, "xhtml", File.join(Uv.syntax_path,"julia.syntax") , false, "solarized",false) : res )
+      ## puts "jlverb:result";p res
+      tex << (@@interactive ? Uv.parse(res.force_encoding("utf-8"), "xhtml", File.join(Uv.syntax_path,"source.julia.syntax") , false, "solarized",false) : res )
       $VERBOSE = warn_level
-#puts "rverb:result";p res
+# puts "jlverb:result";p res
 
       filter.outType=nil
     end

data/lib/dyndoc/base/utils.rb

@@ -119,7 +119,7 @@ module Dyndoc
     end
 
     def Utils.protect_extraction(str)
-      str.gsub(/(?:\#|\#\#|@|#F|#R|#r|\:R|\:r|#Rb|#rb|\:|\:Rb|\:rb)+\{/) {|e| "\\"+e}
+      str.gsub(/(?:\#|\:dyn|\#\#|@|#F|#R|#r|\:R|\:r|#Rb|#rb|\:|\:Rb|\:rb)+\{/) {|e| "\\"+e}
     end
 
     ## the scanner converts automatically  {#toto#} in {#toto][#} and   {@toto@} in {@toto][#}

data/lib/dyndoc-core.rb

@@ -42,6 +42,7 @@ Settings.define 'cfg_dyn.working_dir', :type => String, :default => ""
 Settings.define 'cfg_dyn.root_doc', :type => String, :default => ""
 Settings.define 'cfg_dyn.nbChar_error', :type => Integer, :default => 300
 Settings.define 'cfg_dyn.langs', :type => Array, :default => ["R"]
+Settings.define 'cfg_dyn.require_first', :type => Array, :default => [""]
 
 Settings.define 'cfg_dyn.devel_mode', :type=> Symbol, :default=> :none
 Settings.define 'cfg_dyn.ruby_debug', :type=> Symbol, :default=> :none

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby-core
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.5.3
 platform: ruby
 authors:
 - CQLS
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -34,22 +34,22 @@ dependencies:
   name: ultraviolet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: "  Provide templating in text document.\n"
 email: rdrouilh@gmail.com
 executables: []
@@ -193,7 +193,7 @@ files:
 - share/julia/dyndocOLD.jl
 - share/julia/dynreport.jl
 - share/julia/ruby.jl
-homepage: http://cqls.upmf-grenoble.fr
+homepage: http://cqls.dyndoc.fr
 licenses:
 - MIT
 - GPL-2.0
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: R and Ruby in text document