dyndoc-ruby-core 1.4.8 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f4236705f48cc9db8e234489a77303b4213389b1dbf4f4d5681851cb1f8a7c
-  data.tar.gz: 04423ca31ef550ea3e30d5fddc86cb5027064b8ac68aefe733da9a13f6444130
+  metadata.gz: 37c974a007f31e6b20f6b08a58059b0bc9fa3985f0c1942d827cc9790e562186
+  data.tar.gz: d1dd34fd772846afa17963341fcb13d54fc66452a1370efe5c146b707cb361b0
 SHA512:
-  metadata.gz: be41ec047d2d52b9d3963e23f664989b2bb6eed24c4ee1e0df7737b9f4a0814026f04fac7cf8341c7af79e27a63e2f244cfbed87cedf2dfa24232de8970cd0fe
-  data.tar.gz: 9f482b734d270328b608ee7ec6bfcbde417df4ee65f0f48a42384c78c62c15ed7736479992c5a9f2313c223e19003f523512e9837d8ef6867ada8a3f339df5a5
+  metadata.gz: 50a41020a4dd69fe0d261b416f80e6a8d3a78728599564850f65542fd64f5f1e8f8459d3e567edb3c6306789e70d587674fa822e09a4a55cc1ba73d17c6852c5
+  data.tar.gz: 9f0f7cf7f5f39015606e2c2c14bbfea6fb24b118b9a8222414e1e17bffc9eb1d5ba1b9213658e9055f07a1fb7d80e4ef4084f0756fed008684bfacdeaac9f3b2

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

@@ -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)

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/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][#}

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.0
 platform: ruby
 authors:
 - CQLS
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere