dyndoc-ruby-core 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2792918d1c715f0334e1d70e055f02f3c783dbc
-  data.tar.gz: 231fd6e4fd285f131767c2119a98d9766a2622f3
+  metadata.gz: d61c9814fbee12e7690e969be05be1508045df8a
+  data.tar.gz: 894618eac5de35bb862ae6156ade8203da680907
 SHA512:
-  metadata.gz: c7cf94895b0b29291a59d0d9bb848c8bff238f2c589aa8af813f19f4af31d7f5d34969e981c352c04237780c1cc558b81c9032a18d7ba5f2af879e4b18e75cf5
-  data.tar.gz: 8d8c4e90a564dc1e3803d08a1931fabd6d2f11e84e4af6db2fce0be0826f4278f8aa20fde75f688f952a3b7243e52125a7ad4731d2128ef2d3ce61d130fae49c
+  metadata.gz: 754c502ef583d5da3e567ba0b64824e4cd3fff6a3b84ecca326ed562405495755df4ea2482d1001993d0e66cf7cd6415c469bbd9879ff2fe35520207c23900d3
+  data.tar.gz: 6783f7f70b01b0ed79ac6e1e65fca16fb92ba0ac6f2cc08fdc6e135f891e77e42be7085b8f94a438c786af1757996a981d588095b96046f0f36a849d4b436c0f

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

@@ -1201,7 +1201,7 @@ p call
             i,*b2=next_block(blck,i)
             codename=parse(b2,filter).strip
             code[codename]=[:blck]
-          when :do,:<,:out,:>,:"r<",:"R<",:"rb<",:"r>",:"R>",:"rb>",:nl,:"\n",:>>,:"?",:tag,:"??",:"=",:"+",:<<,:"%",:"html>",:"tex>",:"txtl>",:"md>",:"adoc>" #NO :yield because of infinite loops
+          when :do,:<,:out,:>,:"r<",:"R<",:"rb<",:"r>",:"R>",:"R>>",:"rb>",:nl,:"\n",:>>,:"?",:tag,:"??",:"=",:"+",:<<,:"%",:"html>",:"tex>",:"txtl>",:"md>",:"adoc>" #NO :yield because of infinite loops
             code[codename] << blck[i]
             i,*b2=next_block(blck,i)
             code[codename] += b2

data/lib/dyndoc/common/tilt.rb

@@ -1,40 +1,67 @@
-require 'tilt' #this allows the use of any other template 
+require 'tilt' #this allows the use of any other template
 require 'tilt/template' #for creating the dyndoc one
 require 'redcloth'
 
 
 module Tilt
-  
+
   class DynDocTemplate < Template
 
     def DynDocTemplate.init(libs=nil)
-      unless $curDyn
-        require 'dyndoc/V3/init/dyn'
-        CqlsDoc.init_dyn
-        CqlsDoc.set_curDyn(:V3)
-        $curDyn.init(false)
-        $curDyn.tmpl_doc.init_doc
-        if libs
-          @@libs=libs
-          $curDyn.tmpl_doc.require_dyndoc_libs(libs)
-        end 
-        "options(bitmapType='cairo')".to_R
-        $curDyn.tmpl.format_output="html"
-        $curDyn.tmpl.dyndoc_mode=:web # No command line
-        #p [$curDyn.tmpl.dyndocMode,$curDyn.tmpl.fmtOutput]
+      # unless $curDyn
+      #   require 'dyndoc/V3/init/dyn'
+      #   CqlsDoc.init_dyn
+      #   CqlsDoc.set_curDyn(:V3)
+      #   $curDyn.init(false)
+      #   $curDyn.tmpl_doc.init_doc
+      #   if libs
+      #     @@libs=libs
+      #     $curDyn.tmpl_doc.require_dyndoc_libs(libs)
+      #   end
+      #   "options(bitmapType='cairo')".to_R
+      #   $curDyn.tmpl.format_output="html"
+      #   $curDyn.tmpl.dyndoc_mode=:web # No command line
+      #   #p [$curDyn.tmpl.dyndocMode,$curDyn.tmpl.fmtOutput]
+      # end
+
+      ## same as interactive-server
+      @tmpl_mngr=nil
+      @tmpl_filename=nil
+      init_dyndoc
+    end
+
+    def init_dyndoc
+      unless @tmpl_mngr
+        Dyndoc.cfg_dyn['dyndoc_session']=:interactive
+        @tmpl_mngr = Dyndoc::Ruby::TemplateManager.new({})
+        ##is it really well-suited for interactive mode???
+      end
+      reinit_dyndoc
+    end
+
+    def reinit_dyndoc
+      if @tmpl_mngr
+        @tmpl_mngr.init_doc({:format_output=> "html"})
+        @tmpl_mngr.require_dyndoc_libs("DyndocWebTools")
+        puts "InteractiveServer (re)initialized!\n"
+        @tmpl_mngr.as_default_tmpl_mngr! #=> Dyndoc.tmpl_mngr activated!
+      end
+    end
+
+    def process_dyndoc(content)
+      ##p [:process_dyndoc_content,content]
+      @content=@tmpl_mngr.parse(content)
+      ##Dyndoc.warn :content, @content
+      @tmpl_mngr.filterGlobal.envir["body.content"]=@content
+      if @tmpl_filename
+        @tmpl_mngr.filterGlobal.envir["_FILENAME_CURRENT_"]=@tmpl_filename.dup
+        @tmpl_mngr.filterGlobal.envir["_FILENAME_"]=@tmpl_filename.dup #register name of template!!!
+        @tmpl_mngr.filterGlobal.envir["_FILENAME_ORIG_"]=@tmpl_filename.dup #register name of template!!!
+        @tmpl_mngr.filterGlobal.envir["_PWD_"]=File.dirname(@tmpl_filename)
       end
+      return @content
     end
 
-    # def init_dyndoc
-    #   unless @tmpl_mngr
-    #     Dyndoc.cfg_dyn['dyndoc_session']=:interactive
-    #     @tmpl_mngr = Dyndoc::Ruby::TemplateManager.new({})
-    #     ##is it really well-suited for interactive mode???
-    #     @tmpl_mngr.init_doc({:format_output=> "html"})
-    #     puts "InteractiveServer initialized!\n"
-    #   end
-    # end
-    
     def self.engine_initialized?
       defined? ::DynDoc
     end
@@ -47,11 +74,11 @@ module Tilt
 
 
     def prepare_output
-		  return $curDyn.tmpl_doc.make_content(data)
+		  return process_dyndoc(data)
     end
- 
+
     def evaluate(scope, locals, &block)
- 
+
 #=begin
       #puts "locals";p locals
       ## first!!!!
@@ -104,9 +131,9 @@ module Tilt
             % Macro for http reference inclusion, per hypertex.
            \def\href#1#2{\special{html:<a href="#1">}#2\special{html:</a>}}
            \def\urlend#1{#1\endgroup}
-           \def\url{\begingroup \tt 
+           \def\url{\begingroup \tt
             \catcode`\_=13 % Don't know why this works.
-            \catcode`\~=11 \catcode`\#=11 \catcode`\^=11 
+            \catcode`\~=11 \catcode`\#=11 \catcode`\^=11
             \catcode`\$=11 \catcode`\&=11 \catcode`\%=11
           \urlend}% \url for plain \TeX.
           PREAMBLE
@@ -146,4 +173,4 @@ Tilt.register Tilt::DynTxtlTemplate,  '_txtl.dyn'
 Tilt.register Tilt::DynTtmTemplate,   '_ttm.dyn'
 Tilt.register Tilt::DynHtmlTemplate,  '_html.dyn'
 Tilt.register Tilt::DynDocTemplate,   '.dyn'
-#puts "dyn registered in tilt!"
+#puts "dyn registered in tilt!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere