dyndoc-ruby-core 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96cc8056fc32b8e3e88f8f689d8cc5c923fc563c
-  data.tar.gz: 3ecb5ff17a16a5bf8f528f2bbd6b09a031e61ec3
+  metadata.gz: 908491605d36117470ce330d56970d32da53676d
+  data.tar.gz: 9a0559e127320a90f93fffb8b5b58af3d5cb81f5
 SHA512:
-  metadata.gz: cdd8fd694820fd0591568af526139adb363a25d633f1d4eee7eea06e84bdb4ce198e3f87d3700d0dc68e58bf3925842748b2095cfa35aeebb7fb1e12b8fc7a7b
-  data.tar.gz: 7321db26f0dc1f66954e34e982ed852a7230afc031c54cf37789461dd21ace084ff5ef95c0c9547f9350248d6ab1e658115ed30290123a64f6675cc3a719dd4f
+  metadata.gz: 2d0afa34b8a8006ed3938db15bfd0f6ee6d77068bae711b643cc377fad00b3f0cd5928a41a4c114050ea889580a2c710d2064907e0d8df5e8b203aa18294ae56
+  data.tar.gz: 05b05760915dd32712c58ef6e8bf92e72e7da0bd3f56e40da1a5f35386ec43cea154272a8b5a0493affdb1735b91ff4d643df7045db8c2b5d7ff3dd8e81cb2eb

data/lib/dyndoc/base/scanner.rb

@@ -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,:"=",:"-",:+,:"%"]
+    @@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+"]
     #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]
@@ -512,7 +512,7 @@ module Dyndoc
       	else
       	  @dtag[:named_tag][key][:tag].sub("_TAG_",Regexp.escape( key.to_s ))
       	end
-            else
+      else
       	return Regexp.escape(key.to_s)
       end
     end

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

@@ -502,7 +502,8 @@ p [vars,b2]
                 parse(b2,filter)
                 filter.outType=nil
         	    end
-      	  when :"=" #equivalent of :var but DO NOT USE :var
+          #equivalent of :var but DO NOT USE :var
+        when :"=",:"tex=",:"md=",:"adoc=",:"txtl=",:"html=",:"rb=",:"R=",:"jl="
       	    i,*b2=next_block(blck,i)
       	    if cond_tag and cond
       #puts "=:b2";p b2
@@ -516,7 +517,7 @@ p [vars,b2]
       #puts "-:b2"
               parse(b2,filter).strip.split(",").each{|key| @vars.remove(key)}
       	    end
-      	  when :+
+      	  when :+,:"tex+",:"md+",:"adoc+",:"txtl+",:"html+",:"rb+",:"R+",:"jl+"
       ##Dyndoc.warn "+:-1:block",[i,blck]
       	    i,*b2=next_block(blck,i)
       ##Dyndoc.warn "+:0:i,b2",[i,b2]
@@ -569,7 +570,7 @@ p [vars,b2]
       #puts "varNew:#{var}";p @vars.extract_raw(var)
       	      end
       	    end
-           when :out,:>,:">!" # :>! is in some sense equivalent of :set
+          when :out,:>,:">!" # :>! is in some sense equivalent of :set
                   i,*b2=next_block(blck,i)
       #puts "block >, cond_tag, cond";p cond_tag ;p cond
       	     if cond_tag and cond and !b2.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby-core
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -187,13 +187,10 @@ files:
 - share/R/tools/dynArray.R
 - share/R/tools/dynCapture.R
 - share/R/tools/dynMsys2.R
-- dyndoc/.DS_Store
 - dyndoc/Dyn/.postload
 - dyndoc/Dyn/.preload
 - dyndoc/Tex/.postload
 - dyndoc/Tex/.preload
-- dyndoc/Tools/.DS_Store
-- dyndoc/Tools/Web/.DS_Store
 homepage: http://cqls.upmf-grenoble.fr
 licenses:
 - MIT