dyndoc-ruby-core 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8db5b8dba56f6bc0ed9ac32ee525033c577e49e4771e76a96dcb0e7c28654d5
-  data.tar.gz: 7dd78c1167b23734ce93a6ca4e125ae106006e7b621eebc7c97dbca5fea9c30f
+  metadata.gz: 0b27ebc4ded9a4c39100237831dbbaddc0fd5b7448902512c65c3d9d6b8e99df
+  data.tar.gz: ffd6521535cfdcaad7bbc2c1c6d484e4ead55e10441896d38d3161aa64f1e9b6
 SHA512:
-  metadata.gz: 549db27aa7991171c22c203caccdc28653b6b2ccb7b9e275565f79e5f4c8a239d4996c97bcad7c4324d802bcbf0f907b7183a388f1644d21e547e9d41d1f3fb3
-  data.tar.gz: fc5c2afdbe9c859940452f246d4dfa8c59d1fc7645ec87a321b86c64edfee0062d3df252cf9f5cfe33acadf05e49c7890eb2baac45ee45abee8e7ce21e058548
+  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
@@ -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!(/\\/,'\\\\\\\\')

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby-core
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - CQLS
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: R and Ruby in text document