aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v0/xml_dom.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2008-09-16 00:36:14 -0400
committerRalph Amissah <ralph@amissah.com>2008-09-16 00:36:14 -0400
commitbc9228c42269bfb4d451ca2d2d92a6a12afb094f (patch)
tree42b666a81ef350d0ff6153a49d159b3a1c348959 /lib/sisu/v0/xml_dom.rb
parentUpdated sisu-0.68.0 (diff)
parentfixes: alphabet list (concordance, dal_idx), and file types (dal_expand_inser... (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/xml_dom.rb')
-rw-r--r--lib/sisu/v0/xml_dom.rb27
1 files changed, 13 insertions, 14 deletions
diff --git a/lib/sisu/v0/xml_dom.rb b/lib/sisu/v0/xml_dom.rb
index 9bcb15ec..13aed504 100644
--- a/lib/sisu/v0/xml_dom.rb
+++ b/lib/sisu/v0/xml_dom.rb
@@ -349,8 +349,8 @@ WOK
(0..6).each { |x| @cont[x]=@level[x]=false }
(4..6).each { |x| @xml_contents_close[x]='' }
data.each do |para|
- para=@trans.markup(para)
@trans.char_enc.utf8(para) if @sys.locale =~/utf-?8/i #% utf8
+ para=@trans.markup(para)
if para =~/^#{Rx[:meta]}\s*(.+?)$/ # for headers
d_meta=SiSU_text_utils::Header_scan.new(@md,para).meta
if d_meta; xml_head(d_meta)
@@ -371,7 +371,8 @@ WOK
unless @rcdc
m=/#{Mx[:id_o]}~(\d+);(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/
if para =~m
- format_scroll=SiSU_XML_format::Format_scroll.new(@md,@sto.text) if @sto.format =~/i[1-9]|null/
+ txt_obj={:txt =>@sto.text}
+ format_scroll=SiSU_XML_format::Format_scroll.new(@md,txt_obj) if @sto.format =~/i[1-9]|ordinary/
case @sto.format
when /^(1):(\S*)/
xml_markup(para)
@@ -438,17 +439,19 @@ WOK
#para=format_scroll.boldPara
elsif para =~/(MetaData)/ \
and para =~/#{Mx[:id_o]}~\d+;[m]\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/ #debug 2003w46 add rc info
- format_scroll=Format_scroll.new(@md,'<br /><a name="metadata">MetaData</a>')
+ txt_obj={:txt =>'<br /><a name="metadata">MetaData</a>'}
+ format_scroll=Format_scroll.new(@md,txt_obj)
para=format_scroll.bold_para
elsif para =~/(Owner Details)/ \
and para !~/#{Mx[:id_o]}~\d+;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/
- format_scroll=Format_scroll.new(@md,'<br /><a name="owner.details">Owner Details</a>')
+ txt_obj={:txt =>'<br /><a name="owner.details">Owner Details</a>'}
+ format_scroll=Format_scroll.new(@md,txt_obj)
@@xml[:owner_details]=format_scroll.bold_para
para=''
- elsif para =~/(.*)<:#>(.*)/
- one,two=$1,$2
- format_text=Format_text_object.new(one,two)
- para=format_text.seg_no_paranum
+ #elsif para =~/(.*)<:#>(.*)/
+ # one,two=$1,$2
+ # format_text=Format_text_object.new(one,two)
+ # para=format_text.seg_no_paranum
end
if para =~/<a name="n\d+">/ \
and para =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/ # -endnote
@@ -456,18 +459,14 @@ WOK
end
if para =~/.*<:#>.*$/
para=if para =~ /#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}/
- format_text=Format_text_object.new(para,'')
+ txt_obj={:txt =>para}
+ format_text=Format_text_object.new(@md,txt_obj)
format_text.scr_inden_ocn_e_no_paranum
end
end
if para !~/#{@vz.margin_txt_0}|#{@vz.margin_txt_1}|#{@vz.margin_txt_2}/
# i don't get the condition for no paranum
end
- if para =~/<:center>/
- one,two=/(.*)<:center>(.*)/.match(para)[1,2]
- format_text=Format_text_object.new(one,two)
- para=format_text.center
- end
else #
end
para.gsub!(/#{Mx[:pa_o]}:\S+#{Mx[:pa_c]}/,'') if para