aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v5/html_segments.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-10-12 10:52:35 -0400
committerRalph Amissah <ralph@amissah.com>2014-10-12 10:52:35 -0400
commit32fd8f3908bc8632e2d8ab4d872f6e4362fe031b (patch)
tree8094371a7fd511409992200f4b7c1cb4c33582d6 /lib/sisu/v5/html_segments.rb
parentv6: '*_parts', remove defaults.rb & some relics related to sisu skins, long gone (diff)
v5: merge v6: remove defaults.rb & some relics related to sisu skinssisu_5.7.0
Diffstat (limited to 'lib/sisu/v5/html_segments.rb')
-rw-r--r--lib/sisu/v5/html_segments.rb25
1 files changed, 11 insertions, 14 deletions
diff --git a/lib/sisu/v5/html_segments.rb b/lib/sisu/v5/html_segments.rb
index 4054e6fc..60cd51f1 100644
--- a/lib/sisu/v5/html_segments.rb
+++ b/lib/sisu/v5/html_segments.rb
@@ -200,7 +200,6 @@ module SiSU_HTML_Seg
attr_reader :seg_name_html,:seg_name_html_tracker
def initialize(md=nil,data='')
@md,@data=md,data
- @vz=SiSU_Viz::Defaults.new
@seg_name_html=@@seg_name_html || nil
@seg_name_html_tracker=@@tracker || nil
@env=SiSU_Env::InfoEnv.new(@md.fns) if @md
@@ -575,19 +574,17 @@ module SiSU_HTML_Seg
if @md.flag_separate_endnotes
dob.obj=dob.obj.gsub(/"\s+href="#(#{Mx[:note]}\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#\\1">}) #endnote- twice #removed file type
end
- if dob.obj !~/#{@vz.margin_txt_w1}|#{@vz.margin_txt_w2}/
- if (dob.is==:heading \
- || dob.is==:heading_insert \
- || dob.is==:para) \
- && (not dob.ocn \
- || (dob.ocn.to_s.empty?))
- format_seg=SiSU_HTML_Format::FormatSeg.new(@md,dob)
- end
- dob.obj=dob.obj.gsub(/\s*(-\{{2}~\d+|<:e[:_]\d+>).*/,'') #potentially dagerous - removes all paragraphs with <!e_!> #?? workpoint
- if dob.obj =~/<a name="_\d+" href="#-\d+">&nbsp;<sup>/ #endnote- note-
- format_seg=SiSU_HTML_Format::FormatSeg.new(@md,dob)
- dob=format_seg.no_paranum
- end
+ if (dob.is==:heading \
+ || dob.is==:heading_insert \
+ || dob.is==:para) \
+ && (not dob.ocn \
+ || (dob.ocn.to_s.empty?))
+ format_seg=SiSU_HTML_Format::FormatSeg.new(@md,dob)
+ end
+ dob.obj=dob.obj.gsub(/\s*(-\{{2}~\d+|<:e[:_]\d+>).*/,'') #potentially dagerous - removes all paragraphs with <!e_!> #?? workpoint
+ if dob.obj =~/<a name="_\d+" href="#-\d+">&nbsp;<sup>/ #endnote- note-
+ format_seg=SiSU_HTML_Format::FormatSeg.new(@md,dob)
+ dob=format_seg.no_paranum
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \