From fb6abb03ac0cfa136afbe1ca0471c14f9bbb52b4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 31 Jan 2013 18:43:17 -0500 Subject: v4 v3: dal (obj), html, br_page* behavior in html depending on origin of break * markup specified v auto --- lib/sisu/v4/dal_doc_objects.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'lib/sisu/v4/dal_doc_objects.rb') 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? -- cgit v1.2.3