dyndoc-ruby-core 1.5.1 → 1.5.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dyndoc/base/filter/filter_mngr.rb +11 -9
- data/lib/dyndoc/base/filter/server.rb +3 -1
- data/lib/dyndoc/base/tmpl/parse_do.rb +12 -11
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0b27ebc4ded9a4c39100237831dbbaddc0fd5b7448902512c65c3d9d6b8e99df
|
4
|
+
data.tar.gz: ffd6521535cfdcaad7bbc2c1c6d484e4ead55e10441896d38d3161aa64f1e9b6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b25f6cda8f759e8f468deb59d946312d242c3006a44ca32c5e087a0ad5654d5ce1d148224729f0b90365c51dd7d4abd7e3832fdbd5a5b90ee551e3829f04ec3e
|
7
|
+
data.tar.gz: '0884f5956472578c84b6736838062d6e3434aaa1612e87d409d256d83f2c2f6de4ba976485a4f1c798a6e070bb586823b2f1352214065b7ba96eb3ca602a1539'
|
@@ -378,7 +378,8 @@ module Dyndoc
|
|
378
378
|
$dyn_logger.write("ERROR R: #{txt} was not properly evaluated!\n") unless Dyndoc.cfg_dyn[:dyndoc_mode]==:normal
|
379
379
|
res=txt
|
380
380
|
end
|
381
|
-
#
|
381
|
+
#
|
382
|
+
puts "#{txt} in #{@rEnvir[0]} is #{res}"
|
382
383
|
when ":r","#r"
|
383
384
|
return txt if @mode==:pre
|
384
385
|
res=RServer.safe_output(txt2,@rEnvir[0],:pretty=>true)
|
@@ -387,7 +388,8 @@ module Dyndoc
|
|
387
388
|
$dyn_logger.write("ERROR R: #{txt} was not properly evaluated!\n") unless Dyndoc.cfg_dyn[:dyndoc_mode]==:normal
|
388
389
|
res=txt
|
389
390
|
end
|
390
|
-
#
|
391
|
+
#
|
392
|
+
puts "#{txt} in #{@rEnvir[0]} is #{res}"
|
391
393
|
when ":jl","#jl"
|
392
394
|
return txt if @mode==:pre
|
393
395
|
## puts "#jl:"+txt2
|
@@ -538,15 +540,14 @@ module Dyndoc
|
|
538
540
|
return res unless out_type
|
539
541
|
case out_type
|
540
542
|
when ":=",":rb=",":Rb=","#rb=","#Rb="
|
541
|
-
|
542
|
-
|
543
|
-
#else res.is_a? Array
|
543
|
+
if res.is_a? String
|
544
|
+
res.inspect
|
544
545
|
#puts out_type;p res;p res.inspect
|
545
|
-
|
546
|
-
|
547
|
-
|
546
|
+
elsif res.is_a? Array and res.length==1
|
547
|
+
res[0].inspect
|
548
|
+
else
|
548
549
|
res.inspect
|
549
|
-
|
550
|
+
end
|
550
551
|
when ":",":rb",":Rb","#rb","#Rb"
|
551
552
|
#puts "convert [rb]:";p res
|
552
553
|
if res.is_a? Array
|
@@ -555,6 +556,7 @@ module Dyndoc
|
|
555
556
|
res.to_s
|
556
557
|
end
|
557
558
|
when ":R=","#R=",":r=","#r="
|
559
|
+
#puts "convert [R]";p res
|
558
560
|
if res.is_a? Array
|
559
561
|
res2="c("+res.map{|e| "'"+e.to_s+"'"}.join(",")+")"
|
560
562
|
res2.gsub!(/\\/,'\\\\\\\\')
|
@@ -904,13 +904,15 @@ module Dyndoc
|
|
904
904
|
|
905
905
|
def JLServer.echo_verb(txt,mode)
|
906
906
|
txtout=Dyndoc::JLServer.echo(txt).strip
|
907
|
+
## p [:jl_echo_verb,txtout]
|
907
908
|
mode=:default unless Dyndoc::VERB.keys.include? mode
|
908
909
|
header= (mode!=:default) and txtout.length>0
|
909
910
|
out=""
|
910
911
|
out << Dyndoc::VERB[mode][:begin] << "\n" if header
|
911
912
|
out << txtout
|
912
913
|
out << "\n" << Dyndoc::VERB[mode][:end] << "\n" if header
|
913
|
-
out
|
914
|
+
## p [:out, out]
|
915
|
+
out
|
914
916
|
end
|
915
917
|
|
916
918
|
end
|
@@ -646,7 +646,7 @@ p [vars,b2]
|
|
646
646
|
end
|
647
647
|
when :"r>>",:"R>>",:rout,:rverb
|
648
648
|
newblck=blck[i]
|
649
|
-
|
649
|
+
i,*b2=next_block(blck,i)
|
650
650
|
if cond_tag and cond
|
651
651
|
vars,b2=get_named_blck(b2,filter)
|
652
652
|
if b2
|
@@ -671,7 +671,7 @@ p [vars,b2]
|
|
671
671
|
end
|
672
672
|
when :"jl>>",:jlverb,:"rb>>",:rbverb
|
673
673
|
newblck=blck[i]
|
674
|
-
|
674
|
+
i,*b2=next_block(blck,i)
|
675
675
|
if cond_tag and cond
|
676
676
|
vars,b2=get_named_blck(b2,filter)
|
677
677
|
if b2
|
@@ -690,12 +690,12 @@ p [vars,b2]
|
|
690
690
|
tex << val
|
691
691
|
end
|
692
692
|
=end
|
693
|
-
|
694
|
-
|
695
|
-
|
693
|
+
make_named_blck(tex,filter,vars,b2)
|
694
|
+
filter.outType=nil
|
695
|
+
end
|
696
696
|
end
|
697
|
-
|
698
|
-
|
697
|
+
when :>>
|
698
|
+
i,*b2=next_block(blck,i)
|
699
699
|
if cond_tag and cond
|
700
700
|
file,b2=get_named_blck(b2,filter)
|
701
701
|
if b2 and file
|
@@ -1827,7 +1827,7 @@ p call
|
|
1827
1827
|
require "dyndoc/common/uv" if @@interactive
|
1828
1828
|
|
1829
1829
|
warn_level = $VERBOSE;$VERBOSE = nil
|
1830
|
-
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") ))
|
1830
|
+
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") ))
|
1831
1831
|
$VERBOSE = warn_level
|
1832
1832
|
#Dyndoc.warn "rverb:result",resUV
|
1833
1833
|
@rEnvir.shift if inR
|
@@ -1860,7 +1860,7 @@ p call
|
|
1860
1860
|
## Dyndoc.warn "rbverb:res",res
|
1861
1861
|
require "dyndoc/common/uv" if @@interactive
|
1862
1862
|
warn_level = $VERBOSE;$VERBOSE = nil
|
1863
|
-
tex << (@@interactive ? Uv.parse(res, "xhtml", File.join(Uv.syntax_path,"ruby.syntax") , false, "solarized",false) : res )
|
1863
|
+
tex << (@@interactive ? Uv.parse(res.force_encoding("utf-8"), "xhtml", File.join(Uv.syntax_path,"source.ruby.syntax") , false, "solarized",false) : res )
|
1864
1864
|
$VERBOSE = warn_level
|
1865
1865
|
#puts "rverb:result";p res
|
1866
1866
|
|
@@ -1892,9 +1892,10 @@ p call
|
|
1892
1892
|
res=JLServer.echo_verb(code,@@interactive ? :raw : mode)
|
1893
1893
|
require "dyndoc/common/uv" if @@interactive
|
1894
1894
|
warn_level = $VERBOSE;$VERBOSE = nil
|
1895
|
-
|
1895
|
+
## puts "jlverb:result";p res
|
1896
|
+
tex << (@@interactive ? Uv.parse(res.force_encoding("utf-8"), "xhtml", File.join(Uv.syntax_path,"source.julia.syntax") , false, "solarized",false) : res )
|
1896
1897
|
$VERBOSE = warn_level
|
1897
|
-
#puts "
|
1898
|
+
# puts "jlverb:result";p res
|
1898
1899
|
|
1899
1900
|
filter.outType=nil
|
1900
1901
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dyndoc-ruby-core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- CQLS
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-04-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: configliere
|
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
214
214
|
version: '0'
|
215
215
|
requirements:
|
216
216
|
- none
|
217
|
-
rubygems_version: 3.
|
217
|
+
rubygems_version: 3.3.7
|
218
218
|
signing_key:
|
219
219
|
specification_version: 4
|
220
220
|
summary: R and Ruby in text document
|