diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-01-31 21:41:55 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-01-31 21:41:55 -0500 |
commit | ee132f1146cbed3266b448e1cea312375c201cf1 (patch) | |
tree | 37498d07d78fa16e21361ccbefeb2adc0d9e6039 /lib/sisu/v4/dal_doc_objects.rb | |
parent | debian/changelog (4.0.3-1) (diff) | |
parent | v4 (v3): version & changelog, dates touched (diff) |
Merge tag 'sisu_4.0.4' into debian/sid
Diffstat (limited to 'lib/sisu/v4/dal_doc_objects.rb')
-rw-r--r-- | lib/sisu/v4/dal_doc_objects.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/sisu/v4/dal_doc_objects.rb b/lib/sisu/v4/dal_doc_objects.rb index 37dfdcd3..13fd8ddb 100644 --- a/lib/sisu/v4/dal_doc_objects.rb +++ b/lib/sisu/v4/dal_doc_objects.rb @@ -420,17 +420,18 @@ module SiSU_DAL_DocumentStructure end end class ObjectLayout - attr_accessor :obj,:is,:of,:tmp + attr_accessor :obj,:is,:of,:from,:tmp def initialize @of=:layout - @is=@obj=@tmp=nil + @is=@obj=@from=@tmp=nil end - def break(h,o=nil) #decide how to deal with, perhaps no obj? + def break(h,f=nil) #decide how to deal with of= @of #String, classification - group is= :break #String, classification - specific type - obj= h[:obj] || ((defined? o.obj) ? o.obj : nil) #String, text content - tmp= h[:tmp] || ((defined? o.tmp) ? o.tmp : nil) #available for processing, empty after use - @of,@is,@obj,@tmp=of,is,obj,tmp + obj= h[:obj] #String, text content + from= f + tmp= h[:tmp] #available for processing, empty after use + @of,@is,@obj,@from,@tmp=of,is,obj,from,tmp self end def insert(h,o=nil) #decide how to deal with, could mimic paragraph? |